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

Timestamp:

May 7, 2015 1:34:22 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

100136

Message:

FE/Qt: Runtime UI: Do not cache already cached options accessible through extra-data manager (step 1).

Location:

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

Files:

• UIKeyboardHandler.cpp (modified) (1 diff)
• UIMachineLogic.cpp (modified) (1 diff)
• UIMachineView.cpp (modified) (1 diff)
• UIMouseHandler.cpp (modified) (1 diff)
• UISession.cpp (modified) (2 diffs)
• UISession.h (modified) (2 diffs)

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

@@ -1403 +1403 @@
                         if (m_fIsKeyboardCaptured)
                         {
-                            if (uisession()->mouseCapturePolicy() == MouseCapturePolicy_Default ||
-                                uisession()->mouseCapturePolicy() == MouseCapturePolicy_HostComboOnly)
+                            const MouseCapturePolicy mcp = gEDataManager->mouseCapturePolicy(vboxGlobal().managedVMUuid());
+                            if (mcp == MouseCapturePolicy_Default || mcp == MouseCapturePolicy_HostComboOnly)
                                 machineLogic()->mouseHandler()->captureMouse(uScreenId);
                         }

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

@@ -503 +503 @@
             takeScreenshot(strLogFolder + "/VBox.png", "png");
             /* How should we handle Guru Meditation? */
-            switch (uisession()->guruMeditationHandlerType())
+            switch (gEDataManager->guruMeditationHandlerType(vboxGlobal().managedVMUuid()))
             {
                 /* Ask how to proceed; Power off VM if proposal accepted: */

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

@@ -575 +575 @@
 
         /* Take HiDPI optimization type into account: */
-        m_pFrameBuffer->setHiDPIOptimizationType(uisession()->hiDPIOptimizationType());
+        m_pFrameBuffer->setHiDPIOptimizationType(gEDataManager->hiDPIOptimizationType(vboxGlobal().managedVMUuid()));
 
         /* Take scaling optimization type into account: */

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

@@ -1019 +1019 @@
 #endif /* Q_WS_X11 */
                         machineLogic()->keyboardHandler()->captureKeyboard(uScreenId);
-                        if (uisession()->mouseCapturePolicy() == MouseCapturePolicy_Default)
+                        const MouseCapturePolicy mcp = gEDataManager->mouseCapturePolicy(vboxGlobal().managedVMUuid());
+                        if (mcp == MouseCapturePolicy_Default)
                             captureMouse(uScreenId);
                     }

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

@@ -939 +939 @@
     , m_pMachineWindowIcon(0)
 #endif /* !Q_WS_MAC */
-    , m_mouseCapturePolicy(MouseCapturePolicy_Default)
-    , m_guruMeditationHandlerType(GuruMeditationHandlerType_Default)
-    , m_hiDPIOptimizationType(HiDPIOptimizationType_None)
     , m_requestedVisualStateType(UIVisualStateType_Invalid)
 #ifdef Q_WS_WIN
@@ -1334 +1331 @@
 #endif /* !Q_WS_MAC */
 
-        /* Determine mouse-capture policy: */
-        m_mouseCapturePolicy = gEDataManager->mouseCapturePolicy(strMachineID);
-
-        /* Determine Guru Meditation handler type: */
-        m_guruMeditationHandlerType = gEDataManager->guruMeditationHandlerType(strMachineID);
-
-        /* Determine HiDPI optimization type: */
-        m_hiDPIOptimizationType = gEDataManager->hiDPIOptimizationType(strMachineID);
-
         /* Is there should be First RUN Wizard? */
         m_fIsFirstTimeStarted = gEDataManager->machineFirstTimeStarted(strMachineID);

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

@@ -137 +137 @@
 #endif /* !Q_WS_MAC */
 
-    /** @name Runtime workflow stuff.
-     ** @{ */
-    /** Returns the mouse-capture policy. */
-    MouseCapturePolicy mouseCapturePolicy() const { return m_mouseCapturePolicy; }
-    /** Returns Guru Meditation handler type. */
-    GuruMeditationHandlerType guruMeditationHandlerType() const { return m_guruMeditationHandlerType; }
-    /** Returns HiDPI optimization type. */
-    HiDPIOptimizationType hiDPIOptimizationType() const { return m_hiDPIOptimizationType; }
-    /** @} */
-
     /** @name Host-screen configuration variables.
      ** @{ */
@@ -439 +429 @@
 #endif /* !Q_WS_MAC */
 
-    /** @name Runtime workflow variables.
-     ** @{ */
-    /** Holds the mouse-capture policy. */
-    MouseCapturePolicy m_mouseCapturePolicy;
-    /** Holds Guru Meditation handler type. */
-    GuruMeditationHandlerType m_guruMeditationHandlerType;
-    /** Holds HiDPI optimization type. */
-    HiDPIOptimizationType m_hiDPIOptimizationType;
-    /** @} */
-
     /** @name Visual-state configuration variables.
      ** @{ */