Changeset 52870 in vbox

Timestamp:

Sep 26, 2014 2:31:02 PM (10 years ago)

Author:

vboxsync

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

96292

Message:

FE/Qt: X11: Runtime UI: Seamless mode: Include mini-toolbar geometry into seamless-mask.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• runtime/seamless/UIMachineWindowSeamless.cpp (modified) (4 diffs)
• runtime/seamless/UIMachineWindowSeamless.h (modified) (3 diffs)
• widgets/UIMiniToolBar.cpp (modified) (1 diff)
• widgets/UIMiniToolBar.h (modified) (1 diff)

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

@@ -74 +74 @@
     m_pMachineView->setFocus();
 }
+
+#ifdef VBOX_WITH_MASKED_SEAMLESS
+# ifdef Q_WS_X11
+void UIMachineWindowSeamless::sltUpdateMiniToolbarMask(const QRect &geo)
+{
+    /* Make sure mini-toolbar exists: */
+    AssertPtrReturnVoid(m_pMiniToolBar);
+
+    /* Remember mini-toolbar mask: */
+    m_maskMiniToolbar = geo;
+
+    /* Re-assign guest mask. */
+    setMask(m_maskGuest);
+}
+# endif /* Q_WS_X11 */
+#endif /* VBOX_WITH_MASKED_SEAMLESS */
 
 void UIMachineWindowSeamless::prepareVisualState()
@@ -103 +119 @@
     /* Make sure we have no background
      * until the first one set-region-event: */
-    setMask(m_maskRegion);
+    setMask(m_maskGuest);
 #endif /* VBOX_WITH_MASKED_SEAMLESS */
 
@@ -132 +148 @@
             actionPool()->action(UIActionIndexRT_M_Machine_S_Close), SLOT(trigger()));
     connect(m_pMiniToolBar, SIGNAL(sigNotifyAboutFocusStolen()), this, SLOT(sltRevokeFocus()));
+#ifdef VBOX_WITH_MASKED_SEAMLESS
+# ifdef Q_WS_X11
+    connect(m_pMiniToolBar, SIGNAL(sigNotifyAboutGeometryChange(const QRect&)),
+            this, SLOT(sltUpdateMiniToolbarMask(const QRect&)));
+# endif /* Q_WS_X11 */
+#endif /* VBOX_WITH_MASKED_SEAMLESS */
 }
 #endif /* !Q_WS_MAC */
@@ -280 +302 @@
 
 #ifdef VBOX_WITH_MASKED_SEAMLESS
-void UIMachineWindowSeamless::setMask(const QRegion &region)
-{
-    /* Prepare mask-region: */
-    QRegion maskRegion(region);
-
-    /* Shift region if left spacer width is NOT zero or top spacer height is NOT zero: */
+void UIMachineWindowSeamless::setMask(const QRegion &maskGuest)
+{
+    /* Remember new guest mask: */
+    m_maskGuest = maskGuest;
+
+    /* Prepare full mask: */
+    QRegion maskFull(m_maskGuest);
+
+    /* Shift full mask if left or top spacer width is NOT zero: */
     if (m_pLeftSpacer->geometry().width() || m_pTopSpacer->geometry().height())
-        maskRegion.translate(m_pLeftSpacer->geometry().width(), m_pTopSpacer->geometry().height());
-
-    /* Seamless-window for empty region should be empty too,
+        maskFull.translate(m_pLeftSpacer->geometry().width(), m_pTopSpacer->geometry().height());
+
+# ifdef Q_WS_X11
+    /* Take into account mini-toolbar mask if necessary: */
+    if (m_pMiniToolBar)
+        maskFull += m_maskMiniToolbar;
+# endif /* Q_WS_X11 */
+
+    /* Seamless-window for empty full mask should be empty too,
      * but the QWidget::setMask() wrapper doesn't allow this.
-     * Instead, we have a full painted screen of seamless-geometry size visible.
-     * Moreover, we can't just hide the empty seamless-window as 'hiding'
-     * 1. will collide with the multi-screen layout behavior and
-     * 2. will cause a task-bar flicker on moving window from one screen to another.
-     * As a *temporary* though quite a dirty workaround we have to make sure
-     * region have at least one pixel. */
-    if (maskRegion.isEmpty())
-        maskRegion += QRect(0, 0, 1, 1);
-    /* Make sure mask-region had changed: */
-    if (m_maskRegion != maskRegion)
+     * Instead, we see a full guest-screen of available-geometry size.
+     * So we have to make sure full mask have at least one pixel. */
+    if (maskFull.isEmpty())
+        maskFull += QRect(0, 0, 1, 1);
+
+    /* Make sure full mask had changed: */
+    if (m_maskFull != maskFull)
     {
         /* Compose viewport region to update: */
-        QRegion toUpdate = m_maskRegion + maskRegion;
-        /* Remember new mask-region: */
-        m_maskRegion = maskRegion;
-        /* Assign new mask-region: */
-        UIMachineWindow::setMask(m_maskRegion);
+        QRegion toUpdate = m_maskFull + maskFull;
+        /* Remember new full mask: */
+        m_maskFull = maskFull;
+        /* Assign new full mask: */
+        UIMachineWindow::setMask(m_maskFull);
         /* Update viewport region finally: */
         m_pMachineView->viewport()->update(toUpdate);

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

@@ -44 +44 @@
     void sltRevokeFocus();
 
+#ifdef VBOX_WITH_MASKED_SEAMLESS
+# ifdef Q_WS_X11
+    /** Assigns mini-toolbar seamless mask. */
+    void sltUpdateMiniToolbarMask(const QRect &geo);
+# endif /* Q_WS_X11 */
+#endif /* VBOX_WITH_MASKED_SEAMLESS */
+
 private:
 
@@ -76 +83 @@
 
 #ifdef VBOX_WITH_MASKED_SEAMLESS
-    /* Helper: Masking stuff: */
-    void setMask(const QRegion &region);
+    /** Assigns guest seamless mask. */
+    void setMask(const QRegion &maskGuest);
 #endif /* VBOX_WITH_MASKED_SEAMLESS */
 
@@ -86 +93 @@
 
 #ifdef VBOX_WITH_MASKED_SEAMLESS
-    /* Variable: Masking stuff: */
-    QRegion m_maskRegion;
+    /** Holds the full seamless mask. */
+    QRegion m_maskFull;
+    /** Holds the guest seamless mask. */
+    QRegion m_maskGuest;
+# ifdef Q_WS_X11
+    /** Holds the mini-toolbar seamless mask. */
+    QRect m_maskMiniToolbar;
+# endif /* Q_WS_X11 */
 #endif /* VBOX_WITH_MASKED_SEAMLESS */
 

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

@@ -416 +416 @@
      * Win host allows to enable it through Qt::WA_TranslucentBackground: */
     setMask(m_pEmbeddedToolbar->geometry());
+
+# ifdef VBOX_WITH_MASKED_SEAMLESS
+    /* Notify listeners as well: */
+    const QRect windowGeo = geometry();
+    emit sigNotifyAboutGeometryChange(windowGeo.intersected(m_pEmbeddedToolbar->geometry().translated(windowGeo.topLeft())));
+# endif /* VBOX_WITH_MASKED_SEAMLESS */
 #endif /* Q_WS_X11 */
 }

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.h

@@ -64 +64 @@
     void sigNotifyAboutFocusStolen();
 
+#ifdef VBOX_WITH_MASKED_SEAMLESS
+# ifdef Q_WS_X11
+    /** Notifies about geometry change. */
+    void sigNotifyAboutGeometryChange(const QRect &geo);
+# endif /* Q_WS_X11 */
+#endif /* VBOX_WITH_MASKED_SEAMLESS */
+
 public: