Changeset 84990 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jun 29, 2020 11:34:28 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9774: Runtime UI: Handling for Visual State change coming from extra-data.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• runtime/UIMachine.cpp (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (2 diffs)
• runtime/UIMachineLogic.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -4627 +4627 @@
                  strKey == GUI_StatusBar_IndicatorOrder)
             emit sigStatusBarConfigurationChange(uMachineID);
+        /* Visual state change: */
+        else if (strKey == GUI_Fullscreen ||
+                 strKey == GUI_Seamless ||
+                 strKey == GUI_Scale)
+            emit sigVisualStateChange(uMachineID);
         /* Scale-factor change: */
         else if (strKey == GUI_ScaleFactor)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -80 +80 @@
     /** Notifies about VirtualBox Manager / Details pane options change. */
     void sigDetailsOptionsChange(DetailsElementType enmType);
+
+    /** Notifies about visual state change. */
+    void sigVisualStateChange(const QUuid &uMachineID);
 
     /** Notifies about menu-bar configuration change. */

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

@@ -166 +166 @@
         /* Remember new visual state: */
         m_visualState = visualState;
+
+        /* Save requested visual state: */
+        gEDataManager->setRequestedVisualState(m_visualState, uiCommon().managedVMUuid());
     }
     else

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

@@ -1209 +1209 @@
 }
 
+void UIMachineLogic::prepareOtherConnections()
+{
+    /* Extra-data connections: */
+    connect(gEDataManager, &UIExtraDataManager::sigVisualStateChange,
+            this, &UIMachineLogic::sltHandleVisualStateChange);
+}
+
 void UIMachineLogic::prepareHandlers()
 {
@@ -2732 +2739 @@
 }
 
+void UIMachineLogic::sltHandleVisualStateChange()
+{
+    /* Check for new requested value stored in extra-data: */
+    const UIVisualStateType enmRequestedState = gEDataManager->requestedVisualState(uiCommon().managedVMUuid());
+    /* Check whether current value OR old requested value differs from new requested one.
+     * That way we will NOT enter seamless mode instantly if it is already planned
+     * but is not entered because we're waiting for a guest addition permission. */
+    if (   visualStateType() != enmRequestedState
+        && uisession()->requestedVisualState() != enmRequestedState)
+    {
+        switch (enmRequestedState)
+        {
+            case UIVisualStateType_Normal: return sltChangeVisualStateToNormal();
+            case UIVisualStateType_Fullscreen: return sltChangeVisualStateToFullscreen();
+            case UIVisualStateType_Seamless: return sltChangeVisualStateToSeamless();
+            case UIVisualStateType_Scale: return sltChangeVisualStateToScale();
+            default: break;
+        }
+    }
+}
+
 void UIMachineLogic::typeHostKeyComboPressRelease(bool fToggleSequence)
 {

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

@@ -227 +227 @@
     virtual void prepareActionGroups();
     virtual void prepareActionConnections();
-    virtual void prepareOtherConnections() {}
+    virtual void prepareOtherConnections();
     virtual void prepareHandlers();
     virtual void prepareMachineWindows() = 0;
@@ -353 +353 @@
     void sltCloseRuntimeUI() { closeRuntimeUI(); }
 
+    /** Handles request for visual state change. */
+    void sltHandleVisualStateChange();
+
 private: