From: Peter Penz <peter.penz19@gmail.com>
Date: Fri, 10 Jun 2011 14:26:28 +0000 (+0200)
Subject: Fix position of toolbar-menu
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/8f6045bac7410ac599b2ece0aa045102be492bd2?ds=sidebyside

Fix position of toolbar-menu

CCBUG: 274495
---

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 4c584cdf9..198e2da77 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -2267,20 +2267,18 @@ void ToolBarMenu::showEvent(QShowEvent* event)
     // Assure that the menu is not shown outside the screen boundaries and
     // that it does not overlap with the parent button.
     const QRect screen = QApplication::desktop()->screenGeometry(QCursor::pos());
-    if (pos.x() < 0) {
-        pos.rx() = 0;
-    } else if (pos.x() + width() >= screen.width()) {
-        pos.rx() = screen.width() - width();
+    if (pos.x() < screen.x()) {
+        pos.rx() = screen.x();
+    } else if (pos.x() + width() > screen.x() + screen.width()) {
+        pos.rx() = screen.x() + screen.width() - width();
     }
 
-    if (pos.y() < 0) {
-        pos.ry() = 0;
-    } else if (pos.y() + height() >= screen.height()) {
+    if (pos.y() < screen.y()) {
+        pos.ry() = screen.y();
+    } else if (pos.y() + height() > screen.y() + screen.height()) {
         pos.ry() = button->mapToGlobal(QPoint(0, 0)).y() - height();
     }
 
-    pos += screen.topLeft();
-
     move(pos);
 }