Changeset 99072 in vbox for trunk

Timestamp:

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

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Runtime UI: A bit of cleanup for mouse handler and indicator.

Location:

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

Files:

• UIIndicatorsPool.cpp (modified) (1 diff)
• UIMouseHandler.cpp (modified) (3 diffs)

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

@@ -851 +851 @@
         connect(m_pMachine, &UIMachine::sigMouseStateChange,
                 this, static_cast<void(UIIndicatorMouse::*)(int)>(&UIIndicatorMouse::setState));
-        setState(m_pMachine->mouseState());
         /* Translate finally: */
         retranslateUi();

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

@@ -253 +253 @@
 int UIMouseHandler::state() const
 {
-    return (uimachine()->isMouseCaptured() ? UIMouseStateType_MouseCaptured : 0) |
+    return uimachine()->machineState() == KMachineState_Null ? 0 :
+           (uimachine()->isMouseCaptured() ? UIMouseStateType_MouseCaptured : 0) |
            (uimachine()->isMouseSupportsAbsolute() ? UIMouseStateType_MouseAbsolute : 0) |
            (uimachine()->isMouseIntegrated() ? 0 : UIMouseStateType_MouseAbsoluteDisabled);
@@ -367 +368 @@
 void UIMouseHandler::sltMachineStateChanged()
 {
-    /* Get machine state: */
-    KMachineState machineState = uimachine()->machineState();
+    /* Get cached machine states: */
+    const KMachineState enmState = uimachine()->machineState();
+
     /* Handle particular machine states: */
-    switch (machineState)
+    switch (enmState)
     {
         case KMachineState_Paused:
@@ -387 +389 @@
      * if we are not in paused VM state already: */
     if (machineLogic()->activeMachineWindow() &&
-        machineState != KMachineState_Paused &&
-        machineState != KMachineState_TeleportingPausedVM)
+        enmState != KMachineState_Paused &&
+        enmState != KMachineState_TeleportingPausedVM)
         UINotificationMessage::forgetAboutPausedVMInput();