Changeset 57025 in vbox for trunk/src/VBox

Timestamp:

Jul 20, 2015 3:37:24 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: 5978: Mini-toolbar: Update internal widget position/mask according to animation state in any case.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp (modified) (3 diffs)

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

@@ -518 +518 @@
     m_pAnimation->update();
 
-    /* Update toolbar geometry if necessary: */
-    const QString strAnimationState = property("AnimationState").toString();
-    if (strAnimationState == "Start")
+    /* Update embedded-toolbar geometry if known: */
+    if (property("AnimationState").toString() == "Final")
+        m_pEmbeddedToolbar->move(m_shownToolbarPosition);
+    else
         m_pEmbeddedToolbar->move(m_hiddenToolbarPosition);
-    else if (strAnimationState == "Final")
-        m_pEmbeddedToolbar->move(m_shownToolbarPosition);
 
     /* Simulate toolbar auto-hiding: */
@@ -579 +578 @@
 
     /* Update embedded-toolbar geometry if known: */
-    const QString strAnimationState = property("AnimationState").toString();
-    if (strAnimationState == "Start")
+    if (property("AnimationState").toString() == "Final")
+        m_pEmbeddedToolbar->move(m_shownToolbarPosition);
+    else
         m_pEmbeddedToolbar->move(m_hiddenToolbarPosition);
-    else if (strAnimationState == "Final")
-        m_pEmbeddedToolbar->move(m_shownToolbarPosition);
 
     /* Adjust window mask: */
@@ -810 +808 @@
     AssertPtrReturnVoid(m_pEmbeddedToolbar);
     m_pEmbeddedToolbar->move(point);
+
+#ifdef Q_WS_X11
+    /* Update window mask: */
+    setMask(m_pEmbeddedToolbar->geometry());
+#endif /* Q_WS_X11 */
 }