[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.1/kdebase/apps/dolphin/src
From:       Peter Penz <peter.penz () gmx ! at>
Date:       2008-07-26 14:11:33
Message-ID: 1217081493.577185.4055.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 838042 by ppenz:

Backport of 838041: Tooltips are shown on wrong position in combination with a dual \
screen setup. Thanks to Lucas Murray for the patch!

CCBUG: 167205

 M  +4 -9      tooltipmanager.cpp  


--- branches/KDE/4.1/kdebase/apps/dolphin/src/tooltipmanager.cpp #838041:838042
@@ -117,7 +117,7 @@
     option.decorationSize = QSize(32, 32);
 
     const QSize size = g_delegate->sizeHint(&option, tip);
-    const QRect desktop = QApplication::desktop()->availableGeometry();
+    const QRect desktop = \
QApplication::desktop()->screenGeometry(m_itemRect.bottomRight());  
     // m_itemRect defines the area of the item, where the tooltip should be
     // shown. Per default the tooltip is shown in the bottom right corner.
@@ -126,16 +126,11 @@
     // - the content is not drawn inside m_itemRect
     int x = m_itemRect.right();
     int y = m_itemRect.bottom();
-    const int xDiff = x + size.width()  - desktop.width();
-    const int yDiff = y + size.height() - desktop.height();
-
-    if ((xDiff > 0) && (yDiff > 0)) {
+    if (x + size.width() - 1 > desktop.right()) {
         x = m_itemRect.left() - size.width();
+    }
+    if (y + size.height() - 1 > desktop.bottom()) {
         y = m_itemRect.top() - size.height();
-    } else if (xDiff > 0) {
-        x -= xDiff;
-    } else if (yDiff > 0) {
-        y -= yDiff;
     }
 
     KToolTip::showTip(QPoint(x, y), tip);


[prev in list] [next in list] [prev in thread] [next in thread]