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

Timestamp:

Aug 11, 2014 6:24:56 PM (11 years ago)

Author:

vboxsync

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

95476

Message:

FE/Qt: 3646: Status-bar Editor: Forgot to update mask in couple of places in r95079.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIStatusBarEditorWindow.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIStatusBarEditorWindow.cpp

@@ -807 +807 @@
     m_pEmbeddedWidget->setGeometry(0, sh.height(), qMax(width(), sh.width()), sh.height());
 
+#ifdef Q_WS_X11
+    /* The setMask functionality is excessive under Win/Mac hosts
+     * because there is a Qt composition works properly,
+     * Mac host has native translucency support,
+     * Win host allows to enable it through Qt::WA_TranslucentBackground: */
+    setMask(m_pEmbeddedWidget->geometry());
+#endif /* Q_WS_X11 */
+
 #ifdef Q_WS_WIN
     /* Raise tool-window for proper z-order. */
@@ -842 +850 @@
     m_pEmbeddedWidget->setGeometry(0, 0, qMax(width(), sh.width()), sh.height());
 
-#ifdef Q_WS_WIN
-    /* Raise tool-window for proper z-order. */
-    raise();
-#endif /* Q_WS_WIN */
-}
-
-void UIStatusBarEditorWindow::updateAnimation()
-{
-    /* Skip if no animation created: */
-    if (!m_pAnimation)
-        return;
-
-    /* Recalculate mdi-sub-window geometry animation boundaries based on size-hint: */
-    const QSize sh = m_pEmbeddedWidget->sizeHint();
-    m_startWidgetGeometry = QRect(0, sh.height(), qMax(width(), sh.width()), sh.height());
-    m_finalWidgetGeometry = QRect(0,           0, qMax(width(), sh.width()), sh.height());
-    m_pAnimation->update();
-}
-
-void UIStatusBarEditorWindow::showEvent(QShowEvent*)
-{
-    /* If window isn't expanded: */
-    if (!m_fExpanded)
-    {
-        /* Start expand animation: */
-        emit sigShown();
-    }
-}
-
-void UIStatusBarEditorWindow::closeEvent(QCloseEvent *pEvent)
-{
-    /* If window isn't expanded: */
-    if (!m_fExpanded)
-    {
-        /* Ignore close-event: */
-        pEvent->ignore();
-        return;
-    }
-
-    /* If animation state is Final: */
-    const QString strAnimationState = property("AnimationState").toString();
-    bool fAnimationComplete = strAnimationState == "Final";
-    if (fAnimationComplete)
-    {
-        /* Ignore close-event: */
-        pEvent->ignore();
-        /* And start collapse animation: */
-        emit sigCollapse();
-    }
-}
-
-void UIStatusBarEditorWindow::setWidgetGeometry(const QRect &rect)
-{
-    /* Apply mdi-sub-window geometry: */
-    m_pEmbeddedWidget->setGeometry(rect);
-
 #ifdef Q_WS_X11
     /* The setMask functionality is excessive under Win/Mac hosts
@@ -905 +857 @@
     setMask(m_pEmbeddedWidget->geometry());
 #endif /* Q_WS_X11 */
+
+#ifdef Q_WS_WIN
+    /* Raise tool-window for proper z-order. */
+    raise();
+#endif /* Q_WS_WIN */
+}
+
+void UIStatusBarEditorWindow::updateAnimation()
+{
+    /* Skip if no animation created: */
+    if (!m_pAnimation)
+        return;
+
+    /* Recalculate mdi-sub-window geometry animation boundaries based on size-hint: */
+    const QSize sh = m_pEmbeddedWidget->sizeHint();
+    m_startWidgetGeometry = QRect(0, sh.height(), qMax(width(), sh.width()), sh.height());
+    m_finalWidgetGeometry = QRect(0,           0, qMax(width(), sh.width()), sh.height());
+    m_pAnimation->update();
+}
+
+void UIStatusBarEditorWindow::showEvent(QShowEvent*)
+{
+    /* If window isn't expanded: */
+    if (!m_fExpanded)
+    {
+        /* Start expand animation: */
+        emit sigShown();
+    }
+}
+
+void UIStatusBarEditorWindow::closeEvent(QCloseEvent *pEvent)
+{
+    /* If window isn't expanded: */
+    if (!m_fExpanded)
+    {
+        /* Ignore close-event: */
+        pEvent->ignore();
+        return;
+    }
+
+    /* If animation state is Final: */
+    const QString strAnimationState = property("AnimationState").toString();
+    bool fAnimationComplete = strAnimationState == "Final";
+    if (fAnimationComplete)
+    {
+        /* Ignore close-event: */
+        pEvent->ignore();
+        /* And start collapse animation: */
+        emit sigCollapse();
+    }
+}
+
+void UIStatusBarEditorWindow::setWidgetGeometry(const QRect &rect)
+{
+    /* Apply mdi-sub-window geometry: */
+    m_pEmbeddedWidget->setGeometry(rect);
+
+#ifdef Q_WS_X11
+    /* The setMask functionality is excessive under Win/Mac hosts
+     * because there is a Qt composition works properly,
+     * Mac host has native translucency support,
+     * Win host allows to enable it through Qt::WA_TranslucentBackground: */
+    setMask(m_pEmbeddedWidget->geometry());
+#endif /* Q_WS_X11 */
 }