diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-08 08:32:48 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-08 08:32:48 (GMT) |
| commit | aa674169ca31b6e296021b3b8f5a448aeecf0973 (patch) | |
| tree | 493f0b7922ac116894a3e7f99833e97984035ccc /src/gui/styles/qmacstyle_mac.mm | |
| parent | 50a668e62739c715dcd4f001b659ff25f71cc9c4 (diff) | |
| parent | 941b13d52d975069d10093a873cd3a55bb2fd7dd (diff) | |
| download | Qt-aa674169ca31b6e296021b3b8f5a448aeecf0973.zip Qt-aa674169ca31b6e296021b3b8f5a448aeecf0973.tar.gz Qt-aa674169ca31b6e296021b3b8f5a448aeecf0973.tar.bz2 | |
Merge branch '4.6' into qstatictext-4.6
Diffstat (limited to 'src/gui/styles/qmacstyle_mac.mm')
| -rw-r--r-- | src/gui/styles/qmacstyle_mac.mm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm index aab16cb..78074c7 100644 --- a/src/gui/styles/qmacstyle_mac.mm +++ b/src/gui/styles/qmacstyle_mac.mm @@ -3380,8 +3380,14 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter if (tb->toolButtonStyle != Qt::ToolButtonIconOnly) { needText = true; if (tb->toolButtonStyle == Qt::ToolButtonTextUnderIcon) { - pr.setHeight(pixmap.size().height()); - cr.adjust(0, pr.bottom() + 1, 0, 1); + QMainWindow *mw = qobject_cast<QMainWindow *>(w->window()); + if (mw && mw->unifiedTitleAndToolBarOnMac()) { + pr.setHeight(pixmap.size().height()); + cr.adjust(0, pr.bottom() + 1, 0, 1); + } else { + pr.setHeight(pixmap.size().height() + 6); + cr.adjust(0, pr.bottom(), 0, -3); + } alignment |= Qt::AlignCenter; } else { pr.setWidth(pixmap.width() + 8); |