Ignore:
Timestamp:
Aug 2, 2010, 9:27:30 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/gui/styles/qcommonstyle.cpp

    r764 r769  
    11541154    if (opt->shape == QTabBar::RoundedSouth || opt->shape == QTabBar::TriangularSouth)
    11551155        verticalShift = -verticalShift;
    1156     tr.adjust(hpadding, vpadding, horizontalShift - hpadding, verticalShift - vpadding);
     1156    tr.adjust(hpadding, verticalShift - vpadding, horizontalShift - hpadding, vpadding);
    11571157    bool selected = opt->state & QStyle::State_Selected;
    11581158    if (selected) {
    1159         tr.setBottom(tr.bottom() - verticalShift);
     1159        tr.setTop(tr.top() - verticalShift);
    11601160        tr.setRight(tr.right() - horizontalShift);
    11611161    }
     
    16131613                    if (toolbutton->toolButtonStyle == Qt::ToolButtonTextUnderIcon) {
    16141614                        pr.setHeight(pmSize.height() + 6);
    1615                         tr.adjust(0, pr.height() - 1, 0, -3);
     1615                        tr.adjust(0, pr.height() - 1, 0, -2);
    16161616                        pr.translate(shiftX, shiftY);
    16171617                        if (!hasArrow) {
Note: See TracChangeset for help on using the changeset viewer.