Changeset 21739 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 21, 2009 11:26:06 AM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: 3948: Mini-ToolBar for Full-screen & Seamless modes: Fixed multi-monitor issue (ToolBar missed on other screens except the first one).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxMiniToolBar.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxMiniToolBar.cpp

@@ -216 +216 @@
     if (aEvent->timerId() == mScrollTimer.timerId())
     {
+        QRect screen = mSeamless ? QApplication::desktop()->availableGeometry (window()) :
+                                   QApplication::desktop()->screenGeometry (window());
         switch (mAlignment)
         {
             case AlignTop:
             {
-                if (((mPositionY == 0) && mSlideToScreen) ||
-                    ((mPositionY == - height() + 1) && !mSlideToScreen))
+                if (((mPositionY == screen.y()) && mSlideToScreen) ||
+                    ((mPositionY == screen.y() - height() + 1) && !mSlideToScreen))
                 {
                     mScrollTimer.stop();
@@ -236 +238 @@
             case AlignBottom:
             {
-                QRect screen = mSeamless ? QApplication::desktop()->availableGeometry (this) :
-                                           QApplication::desktop()->screenGeometry (this);
-                if (((mPositionY == screen.height() - height()) && mSlideToScreen) ||
-                    ((mPositionY == screen.height() - 1) && !mSlideToScreen))
+                if (((mPositionY == screen.y() + screen.height() - height()) && mSlideToScreen) ||
+                    ((mPositionY == screen.y() + screen.height() - 1) && !mSlideToScreen))
                 {
                     mScrollTimer.stop();
@@ -377 +377 @@
 void VBoxMiniToolBar::moveToBase()
 {
-    QRect screen = mSeamless ? QApplication::desktop()->availableGeometry (this) :
-                               QApplication::desktop()->screenGeometry (this);
-    mPositionX = screen.width() / 2 - width() / 2;
+    QRect screen = mSeamless ? QApplication::desktop()->availableGeometry (window()) :
+                               QApplication::desktop()->screenGeometry (window());
+    mPositionX = screen.x() + screen.width() / 2 - width() / 2;
     switch (mAlignment)
     {
         case AlignTop:
         {
-            mPositionY = - height() + 1;
+            mPositionY = screen.y() - height() + 1;
             break;
         }
         case AlignBottom:
         {
-            mPositionY = screen.height() - 1;
+            mPositionY = screen.y() + screen.height() - 1;
             break;
         }
@@ -404 +404 @@
 {
     QPoint globalPosition = parentWidget()->mapFromGlobal (aPoint);
-    QRect fullArea = QApplication::desktop()->screenGeometry (this);
-    QRect realArea = mSeamless ? QApplication::desktop()->availableGeometry (this) :
-                                 QApplication::desktop()->screenGeometry (this);
+    QRect fullArea = QApplication::desktop()->screenGeometry (window());
+    QRect realArea = mSeamless ? QApplication::desktop()->availableGeometry (window()) :
+                                 QApplication::desktop()->screenGeometry (window());
     QPoint shiftToReal (realArea.topLeft() - fullArea.topLeft());
     return globalPosition + shiftToReal;