Changeset 93366 in vbox for trunk/src/VBox

Timestamp:

Jan 20, 2022 5:13:31 PM (3 years ago)

Author:

vboxsync

Message:

Reverting r149419 since I found better solution.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• notificationcenter/UINotificationCenter.cpp (modified) (1 diff)
• notificationcenter/UINotificationCenter.h (modified) (1 diff)
• runtime/UIMachineView.cpp (modified) (1 diff)
• runtime/UIMachineView.h (modified) (1 diff)
• runtime/UIMachineWindow.cpp (modified) (1 diff)
• runtime/UIMachineWindow.h (modified) (1 diff)
• runtime/fullscreen/UIMachineWindowFullscreen.cpp (modified) (1 diff)
• runtime/normal/UIMachineWindowNormal.cpp (modified) (1 diff)
• runtime/scale/UIMachineWindowScale.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationCenter.cpp

@@ -763 +763 @@
     m_iAnimatedValue = iValue;
     adjustGeometry();
-    emit sigAnimationStep();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationCenter.h

@@ -55 +55 @@
     /** Requests sliding state-machine to close overlay. */
     void sigClose();
-    /** Notifies listeners about animation step. */
-    void sigAnimationStep();
 
 public:

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

@@ -247 +247 @@
 {
     return frameBuffer() ? (double)(frameBuffer()->width()) / frameBuffer()->height() : 0;
-}
-
-void UIMachineView::updateView()
-{
-    viewport()->update();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h

@@ -102 +102 @@
     double aspectRatio() const;
 
-    /** Updates machine-view's viewport.
-      * @remarks Used to update in case of notification-center animation. */
-    void updateView();
     /** Updates console's display viewport.
       * @remarks Used to update 3D-service overlay viewport as well. */

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

@@ -178 +178 @@
     /* Update window-title: */
     updateAppearanceOf(UIVisualElement_WindowTitle);
-}
-
-void UIMachineWindow::sltHandleNotificationCenterAnimationStep()
-{
-    /* For certain machine states: */
-    const KMachineState enmState = uisession()->machineState();
-    switch (enmState)
-    {
-        /* Like those related to paused VM: */
-        case KMachineState_Paused:
-        case KMachineState_TeleportingPausedVM:
-        {
-            /* Update view's viewport, cause we have pause screenshot
-             * distorted with animation artifacts. */
-            machineView()->updateView();
-            break;
-        }
-        default:
-            break;
-    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.h

@@ -125 +125 @@
     virtual void sltMachineStateChanged();
 
-    /** Handles notification-center animation steps. */
-    void sltHandleNotificationCenterAnimationStep();
-
 protected:
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

@@ -222 +222 @@
 {
     if (gpNotificationCenter && (m_uScreenId == 0))
-    {
         gpNotificationCenter->setParent(centralWidget());
-        disconnect(gpNotificationCenter, &UINotificationCenter::sigAnimationStep, 0, 0);
-        connect(gpNotificationCenter, &UINotificationCenter::sigAnimationStep,
-                this, &UIMachineWindowFullscreen::sltHandleNotificationCenterAnimationStep);
-    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -326 +326 @@
 {
     if (gpNotificationCenter && (m_uScreenId == 0))
-    {
         gpNotificationCenter->setParent(centralWidget());
-        disconnect(gpNotificationCenter, &UINotificationCenter::sigAnimationStep, 0, 0);
-        connect(gpNotificationCenter, &UINotificationCenter::sigAnimationStep,
-                this, &UIMachineWindowNormal::sltHandleNotificationCenterAnimationStep);
-    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp

@@ -62 +62 @@
 {
     if (gpNotificationCenter && (m_uScreenId == 0))
-    {
         gpNotificationCenter->setParent(centralWidget());
-        disconnect(gpNotificationCenter, &UINotificationCenter::sigAnimationStep, 0, 0);
-        connect(gpNotificationCenter, &UINotificationCenter::sigAnimationStep,
-                this, &UIMachineWindowScale::sltHandleNotificationCenterAnimationStep);
-    }
 }