Changeset 73845 in vbox

Timestamp:

Aug 22, 2018 6:18:34 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: UISlidingAnimation: Notify about animation completion only when there really was an animation.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UISlidingAnimation.cpp (modified) (3 diffs)
• UISlidingAnimation.h (modified) (2 diffs)

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

@@ -32 +32 @@
     , m_fReverse(fReverse)
     , m_pAnimation(0)
+    , m_fIsInProgress(false)
     , m_pWidget(0)
     , m_pLabel1(0)
@@ -51 +52 @@
 void UISlidingAnimation::animate(SlidingDirection enmDirection)
 {
+    /* Mark animation started: */
+    m_fIsInProgress = true;
+
     /* Acquire parent size: */
     const QSize parentSize = parentWidget()->size();
@@ -100 +104 @@
             break;
         }
+    }
+}
+
+void UISlidingAnimation::sltHandleStateEnteredStart()
+{
+    /* If animation started: */
+    if (m_fIsInProgress)
+    {
+        /* Mark animation finished: */
+        m_fIsInProgress = false;
+        /* And notify listeners: */
+        emit sigAnimationComplete(SlidingDirection_Reverse);
+    }
+}
+
+void UISlidingAnimation::sltHandleStateEnteredFinal()
+{
+    /* If animation started: */
+    if (m_fIsInProgress)
+    {
+        /* Mark animation finished: */
+        m_fIsInProgress = false;
+        /* And notify listeners: */
+        emit sigAnimationComplete(SlidingDirection_Forward);
     }
 }

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

@@ -72 +72 @@
 
     /** Handles entering for 'Start' state. */
-    void sltHandleStateEnteredStart() { emit sigAnimationComplete(SlidingDirection_Reverse); }
+    void sltHandleStateEnteredStart();
     /** Handles entering for 'Final' state. */
-    void sltHandleStateEnteredFinal() { emit sigAnimationComplete(SlidingDirection_Forward); }
+    void sltHandleStateEnteredFinal();
 
 private:
@@ -96 +96 @@
     /** Holds the animation instance. */
     UIAnimation     *m_pAnimation;
+    /** Holds whether animation is in progress. */
+    bool             m_fIsInProgress;
     /** Holds sub-window start-geometry. */
     QRect            m_startWidgetGeometry;