Changeset 88633 in vbox for trunk/src/VBox

Timestamp:

Apr 21, 2021 12:43:05 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8161: A bit of rework for Runtime UI; Move requested visual-state stuff from UISession to UIMachine; Save it instantly instead of power off sequence.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachine.cpp (modified) (4 diffs)
• UIMachine.h (modified) (2 diffs)
• UISession.cpp (modified) (2 diffs)
• UISession.h (modified) (2 diffs)

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

@@ -137 +137 @@
 }
 
+void UIMachine::setRequestedVisualState(UIVisualStateType visualStateType)
+{
+    /* Remember requested visual state: */
+    m_enmRequestedVisualState = visualStateType;
+
+    /* Save only if it's different from Invalid and from current one: */
+    if (   m_enmRequestedVisualState != UIVisualStateType_Invalid
+        && gEDataManager->requestedVisualState(uiCommon().managedVMUuid()) != m_enmRequestedVisualState)
+        gEDataManager->setRequestedVisualState(m_enmRequestedVisualState, uiCommon().managedVMUuid());
+}
+
+UIVisualStateType UIMachine::requestedVisualState() const
+{
+    return m_enmRequestedVisualState;
+}
+
 void UIMachine::closeRuntimeUI()
 {
@@ -193 +209 @@
     , m_initialVisualState(UIVisualStateType_Normal)
     , m_visualState(UIVisualStateType_Invalid)
+    , m_enmRequestedVisualState(UIVisualStateType_Invalid)
     , m_pMachineLogic(0)
 {
@@ -250 +267 @@
     m_allowedVisualStates = static_cast<UIVisualStateType>(UIVisualStateType_All ^ restrictedVisualStates);
 
-    /* Load requested visual state: */
-    UIVisualStateType requestedVisualState = gEDataManager->requestedVisualState(uiCommon().managedVMUuid());
+    /* Load requested visual state, it can override initial one: */
+    m_enmRequestedVisualState = gEDataManager->requestedVisualState(uiCommon().managedVMUuid());
     /* Check if requested visual state is allowed: */
-    if (isVisualStateAllowed(requestedVisualState))
-    {
-        switch (requestedVisualState)
+    if (isVisualStateAllowed(m_enmRequestedVisualState))
+    {
+        switch (m_enmRequestedVisualState)
         {
-            /* Direct transition to scale/fullscreen mode allowed: */
+            /* Direct transition allowed to scale/fullscreen modes only: */
             case UIVisualStateType_Scale:      m_initialVisualState = UIVisualStateType_Scale; break;
             case UIVisualStateType_Fullscreen: m_initialVisualState = UIVisualStateType_Fullscreen; break;
-            /* While to seamless is not, so we have to make request to do transition later: */
-            case UIVisualStateType_Seamless:   uisession()->setRequestedVisualState(UIVisualStateType_Seamless); break;
             default: break;
         }
@@ -272 +287 @@
 void UIMachine::cleanupMachineLogic()
 {
-    /* Session UI can have requested visual state: */
-    if (uisession())
-    {
-        /* Get requested visual state: */
-        UIVisualStateType requestedVisualState = uisession()->requestedVisualState();
-        /* Or current visual state if requested is invalid: */
-        if (requestedVisualState == UIVisualStateType_Invalid)
-            requestedVisualState = m_visualState;
-
-        /* Save requested visual state: */
-        gEDataManager->setRequestedVisualState(requestedVisualState, uiCommon().managedVMUuid());
-    }
-
     /* Destroy machine-logic if exists: */
     if (m_pMachineLogic)

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

@@ -73 +73 @@
     void asyncChangeVisualState(UIVisualStateType visualStateType);
 
+    /** Requests visual-state to be entered when possible. */
+    void setRequestedVisualState(UIVisualStateType visualStateType);
+    /** Returns requested visual-state to be entered when possible. */
+    UIVisualStateType requestedVisualState() const;
+
     /** Close Runtime UI. */
     void closeRuntimeUI();
@@ -117 +122 @@
     /** Holds current visual state. */
     UIVisualStateType m_visualState;
+    /** Holds visual state which should be entered when possible. */
+    UIVisualStateType m_enmRequestedVisualState;
     /** Holds current machine-logic. */
     UIMachineLogic *m_pMachineLogic;

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

@@ -508 +508 @@
 }
 
+void UISession::setRequestedVisualState(UIVisualStateType visualStateType)
+{
+    m_pMachine->setRequestedVisualState(visualStateType);
+}
+
+UIVisualStateType UISession::requestedVisualState() const
+{
+    return m_pMachine->requestedVisualState();
+}
+
 bool UISession::setPause(bool fOn)
 {
@@ -942 +952 @@
     , m_machineState(KMachineState_Null)
     , m_pMachineWindowIcon(0)
-    , m_requestedVisualStateType(UIVisualStateType_Invalid)
 #ifdef VBOX_WS_WIN
     , m_alphaCursor(0)

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

@@ -179 +179 @@
     void changeVisualState(UIVisualStateType visualStateType);
     /** Requests visual-state to be entered when possible. */
-    void setRequestedVisualState(UIVisualStateType visualStateType) { m_requestedVisualStateType = visualStateType; }
+    void setRequestedVisualState(UIVisualStateType visualStateType);
     /** Returns requested visual-state to be entered when possible. */
-    UIVisualStateType requestedVisualState() const { return m_requestedVisualStateType; }
+    UIVisualStateType requestedVisualState() const;
 
     bool isSaved() const { return machineState() == KMachineState_Saved; }
@@ -529 +529 @@
     /** @} */
 
-    /** @name Visual-state configuration variables.
-     ** @{ */
-    /** Determines which visual-state should be entered when possible. */
-    UIVisualStateType m_requestedVisualStateType;
-    /** @} */
-
 #if defined(VBOX_WS_WIN)
     HCURSOR m_alphaCursor;