summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Manuel Duclos Vergara <carlos.duclos@nokia.com>2010-03-18 11:32:08 (GMT)
committerCarlos Manuel Duclos Vergara <carlos.duclos@nokia.com>2010-03-18 11:32:08 (GMT)
commit7528843450eb84ea3c7241ddf39b687d2507e27d (patch)
treeb0e5d41dda4e2c8f779cc297d4e35054a3b203c0
parent603a8501e0e203ecd6075b19be3bccb11f16ee88 (diff)
downloadQt-7528843450eb84ea3c7241ddf39b687d2507e27d.zip
Qt-7528843450eb84ea3c7241ddf39b687d2507e27d.tar.gz
Qt-7528843450eb84ea3c7241ddf39b687d2507e27d.tar.bz2
QToolTip may be placed incorrectly when using FullScreen mode - Mac OS X
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. Task-number: QTBUG-8402 Reviewed-by: Prasanth
-rw-r--r--src/gui/kernel/qtooltip.cpp11
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