Changeset 769 for trunk/src/gui/styles/qcommonstyle.cpp
- Timestamp:
- Aug 2, 2010, 9:27:30 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.6.3 (added) merged: 768 /branches/vendor/nokia/qt/current merged: 767 /branches/vendor/nokia/qt/4.6.2 removed
- Property svn:mergeinfo changed
-
trunk/src/gui/styles/qcommonstyle.cpp
r764 r769 1154 1154 if (opt->shape == QTabBar::RoundedSouth || opt->shape == QTabBar::TriangularSouth) 1155 1155 verticalShift = -verticalShift; 1156 tr.adjust(hpadding, v padding, horizontalShift - hpadding, verticalShift -vpadding);1156 tr.adjust(hpadding, verticalShift - vpadding, horizontalShift - hpadding, vpadding); 1157 1157 bool selected = opt->state & QStyle::State_Selected; 1158 1158 if (selected) { 1159 tr.set Bottom(tr.bottom() - verticalShift);1159 tr.setTop(tr.top() - verticalShift); 1160 1160 tr.setRight(tr.right() - horizontalShift); 1161 1161 } … … 1613 1613 if (toolbutton->toolButtonStyle == Qt::ToolButtonTextUnderIcon) { 1614 1614 pr.setHeight(pmSize.height() + 6); 1615 tr.adjust(0, pr.height() - 1, 0, - 3);1615 tr.adjust(0, pr.height() - 1, 0, -2); 1616 1616 pr.translate(shiftX, shiftY); 1617 1617 if (!hasArrow) {
Note:
See TracChangeset
for help on using the changeset viewer.