diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-18 14:58:16 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-18 14:58:16 (GMT) |
| commit | 6ac26093169e6ab89a868f8b71488ef29ecf3c3b (patch) | |
| tree | 1b4752b14917e2493a3294fc8f99cd37fe6edcbd /src/gui/kernel | |
| parent | f661bb26dc3b30c3d5113a56885bbe07b90fd3ce (diff) | |
| parent | 7528843450eb84ea3c7241ddf39b687d2507e27d (diff) | |
| download | Qt-6ac26093169e6ab89a868f8b71488ef29ecf3c3b.zip Qt-6ac26093169e6ab89a868f8b71488ef29ecf3c3b.tar.gz Qt-6ac26093169e6ab89a868f8b71488ef29ecf3c3b.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QToolTip may be placed incorrectly when using FullScreen mode - Mac OS X
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qtooltip.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/gui/kernel/qtooltip.cpp b/src/gui/kernel/qtooltip.cpp index c912129..1343959 100644 --- a/src/gui/kernel/qtooltip.cpp +++ b/src/gui/kernel/qtooltip.cpp @@ -368,7 +368,16 @@ void QTipLabel::placeTip(const QPoint &pos, QWidget *w) #ifdef Q_WS_MAC - QRect screen = QApplication::desktop()->availableGeometry(getTipScreen(pos, w)); + // When in full screen mode, there is no Dock nor Menu so we can use + // the whole screen for displaying the tooltip. However when not in + // full screen mode we need to save space for the dock, so we use + // availableGeometry instead. + extern bool qt_mac_app_fullscreen; //qapplication_mac.mm + QRect screen; + if(qt_mac_app_fullscreen) + screen = QApplication::desktop()->screenGeometry(getTipScreen(pos, w)); + else + screen = QApplication::desktop()->availableGeometry(getTipScreen(pos, w)); #else QRect screen = QApplication::desktop()->screenGeometry(getTipScreen(pos, w)); #endif |