Changeset 27446 in vbox

Timestamp:

Mar 17, 2010 1:24:11 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

58928

Message:

FE/Qt4: Mini-toolbar coordinate fix; seamless mini-toolbar fix for new running VM core.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• runtime/seamless/UIMachineWindowSeamless.cpp (modified) (1 diff)
• widgets/VBoxMiniToolBar.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp

@@ -365 +365 @@
 #endif
 
-    /* Including mini tool-bar area: */
+    /* Mini tool-bar: */
     if (m_pMiniToolBar)
     {
+        /* Get mini-toolbar mask: */
         QRegion toolBarRegion(m_pMiniToolBar->mask());
+
+        /* Shift mask according global position: */
         toolBarRegion.translate(m_pMiniToolBar->mapToGlobal(toolBarRegion.boundingRect().topLeft()) - QPoint(1, 0));
+
+        /* Shift mask according available geometry: */
+        int iScreen = static_cast<UIMachineLogicSeamless*>(machineLogic())->hostScreenForGuestScreen(m_uScreenId);
+        QRect screenArea = QApplication::desktop()->screenGeometry(iScreen);
+        QRect workingArea = vboxGlobal().availableGeometry(iScreen);
+        QPoint workingAreaOffset(screenArea.topLeft() - workingArea.topLeft());
+        toolBarRegion.translate(workingAreaOffset);
+
+        /* Including mini tool-bar mask: */
         region += toolBarRegion;
     }

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

@@ -225 +225 @@
             case AlignTop:
             {
-                if (((mPositionY == screen.y()) && mSlideToScreen) ||
-                    ((mPositionY == screen.y() - height() + 1) && !mSlideToScreen))
+                if (((mPositionY == 0) && mSlideToScreen) ||
+                    ((mPositionY == - height() + 1) && !mSlideToScreen))
                 {
                     mScrollTimer.stop();
@@ -241 +241 @@
             case AlignBottom:
             {
-                if (((mPositionY == screen.y() + screen.height() - height()) && mSlideToScreen) ||
-                    ((mPositionY == screen.y() + screen.height() - 1) && !mSlideToScreen))
+                if (((mPositionY == screen.height() - height()) && mSlideToScreen) ||
+                    ((mPositionY == screen.height() - 1) && !mSlideToScreen))
                 {
                     mScrollTimer.stop();
@@ -392 +392 @@
         case AlignTop:
         {
-            mPositionY = screen.y() - height() + 1;
+            mPositionY = - height() + 1;
             break;
         }
         case AlignBottom:
         {
-            mPositionY = screen.y() + screen.height() - 1;
+            mPositionY = screen.height() - 1;
             break;
         }