Changeset 99071 in vbox for trunk

Timestamp:

Mar 20, 2023 4:21:45 PM (21 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Runtime UI: More appropriate fixes for changes in keyboard handler and indicator done in r156332 and 156333.

Location:

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

Files:

• UIIndicatorsPool.cpp (modified) (2 diffs)
• UIKeyboardHandler.cpp (modified) (1 diff)

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

@@ -929 +929 @@
         setStateIcon(15, UIIconPool::iconSet(":/hostkey_captured_pressed_checked_16px.png"));
         /* Configure connection: */
-        connect(pMachine, &UIMachine::sigInitialized,
-                this, &UIIndicatorKeyboard::sltFetchState);
         connect(pMachine, &UIMachine::sigKeyboardStateChange,
                 this, static_cast<void(UIIndicatorKeyboard::*)(int)>(&UIIndicatorKeyboard::setState));
@@ -957 +955 @@
         setToolTip(strToolTip.arg(strFullData));
     }
-
-private slots:
-
-    /** Fetches the keyboard-state from machine UI. */
-    void sltFetchState() { setState(m_pMachine->keyboardState()); }
 };
 

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

@@ -908 +908 @@
 void UIKeyboardHandler::sltMachineStateChanged()
 {
-    /* Get previous and cached machine states: */
-    const KMachineState enmPreviousState = uimachine()->machineStatePrevious();
+    /* Get cached machine states: */
     const KMachineState enmState = uimachine()->machineState();
 
     /* Notify all the listeners that machine state was [de]initialized: */
-    if (   enmPreviousState == KMachineState_Null
-        || enmState == KMachineState_Null)
+    if (   enmState == KMachineState_Null
+        || enmState == KMachineState_Starting)
         emit sigStateChange(state());