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

Timestamp:

Jul 9, 2014 2:32:38 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Mini tool-bar: Make sure tool-bar position is updated properly on host/guest geometry changes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIAnimationFramework.cpp (modified) (2 diffs)
• widgets/UIMiniToolBar.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIAnimationFramework.cpp

@@ -26 +26 @@
 /* GUI includes: */
 #include "UIAnimationFramework.h"
+
+/* Other VBox includes: */
+#include "iprt/assert.h"
 
 /* static */
@@ -69 +72 @@
 void UIAnimation::prepare()
 {
+    /* Make sure parent asigned: */
+    AssertPtrReturnVoid(parent());
+
     /* Prepare animation-machine: */
     m_pAnimationMachine = new QStateMachine(this);
     /* Create 'start' state: */
     m_pStateStart = new QState(m_pAnimationMachine);
+    m_pStateStart->assignProperty(parent(), "AnimationState", QString("Start"));
     connect(m_pStateStart, SIGNAL(propertiesAssigned()), this, SIGNAL(sigStateEnteredStart()));
     /* Create 'final' state: */
     m_pStateFinal = new QState(m_pAnimationMachine);
+    m_pStateFinal->assignProperty(parent(), "AnimationState", QString("Final"));
     connect(m_pStateFinal, SIGNAL(propertiesAssigned()), this, SIGNAL(sigStateEnteredFinal()));
 

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

@@ -191 +191 @@
     updateAutoHideAnimationBounds();
 
+    /* Update toolbar geometry if necessary: */
+    const QString strAnimationState = property("AnimationState").toString();
+    if (strAnimationState == "Start")
+        m_pEmbeddedToolbar->move(m_hiddenToolbarPosition);
+    else if (strAnimationState == "Final")
+        m_pEmbeddedToolbar->move(m_shownToolbarPosition);
+
     /* Simulate toolbar auto-hiding: */
     simulateToolbarAutoHiding();