Changeset 27424 in vbox

Timestamp:

Mar 16, 2010 7:48:42 PM (15 years ago)

Author:

vboxsync

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

58900

Message:

FE/Qt4: New running VM core: seamless mode is now taking into account situation when machine-view was not resized to full machine-window size and seamless mask requires some shift.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineWindow.h (modified) (1 diff)
• seamless/UIMachineViewSeamless.cpp (modified) (1 diff)
• seamless/UIMachineWindowSeamless.cpp (modified) (3 diffs)
• seamless/UIMachineWindowSeamless.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.h

@@ -57 +57 @@
     CSession& session() const;
 
+    /* Public members: */
     virtual void reshow() {}
+    virtual void setMask(const QRegion &region) { machineWindow()->setMask(region); }
 
 protected:

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

@@ -158 +158 @@
             {
                 m_lastVisibleRegion = pSetRegionEvent->region();
-                machineWindowWrapper()->machineWindow()->setMask(m_lastVisibleRegion);
+                machineWindowWrapper()->setMask(m_lastVisibleRegion);
             }
             return true;

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

@@ -356 +356 @@
     QRegion region = constRegion;
 
+    /* Shift region if left spacer width is NOT zero or top spacer height is NOT zero: */
+    if (m_pLeftSpacer->geometry().width() || m_pTopSpacer->geometry().height())
+        region.translate(m_pLeftSpacer->geometry().width(), m_pTopSpacer->geometry().height());
+
 #if 0 // TODO: Is it really needed now?
     /* The global mask shift cause of toolbars and such things. */
@@ -361 +365 @@
 #endif
 
-    /* Including mini tool-bar area */
-    QRegion toolBarRegion(m_pMiniToolBar->mask());
-    toolBarRegion.translate(m_pMiniToolBar->mapToGlobal(toolBarRegion.boundingRect().topLeft()) - QPoint(1, 0));
-    region += toolBarRegion;
+    /* Including mini tool-bar area: */
+    if (m_pMiniToolBar)
+    {
+        QRegion toolBarRegion(m_pMiniToolBar->mask());
+        toolBarRegion.translate(m_pMiniToolBar->mapToGlobal(toolBarRegion.boundingRect().topLeft()) - QPoint(1, 0));
+        region += toolBarRegion;
+    }
 
 #if 0 // TODO: Is it really needed now?
@@ -432 +439 @@
 }
 
-void UIMachineWindowSeamless::clearMask()
-{
-#ifdef Q_WS_WIN
-    SetWindowRgn(winId(), 0, TRUE);
-#else
-    QMainWindow::clearMask();
-#endif
-}
-

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

@@ -101 +101 @@
     void showSeamless();
     void setMask(const QRegion &region);
-    void clearMask();
 
     /* Private variables: */