Changeset 53249 in vbox for trunk/src

Timestamp:

Nov 6, 2014 9:14:36 AM (10 years ago)

Author:

vboxsync

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

96808

Message:

FE/Qt: 7582: Runtime UI: Make the activate-on-hover behavior configurable.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (2 diffs)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• runtime/UIMouseHandler.cpp (modified) (2 diffs)

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

@@ -46 +46 @@
 const char* UIExtraDataDefs::GUI_RestrictedGlobalSettingsPages = "GUI/RestrictedGlobalSettingsPages";
 const char* UIExtraDataDefs::GUI_RestrictedMachineSettingsPages = "GUI/RestrictedMachineSettingsPages";
+
+/* Settings: Display: */
+const char* UIExtraDataDefs::GUI_ActivateHoveredMachineWindow = "GUI/ActivateHoveredMachineWindow";
 
 /* Settings: Keyboard: */

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

@@ -59 +59 @@
     /** @name Settings
       * @{ */
-        /** Holds restricted Plobal Settings pages. */
+        /** Holds restricted Global Settings pages. */
         extern const char* GUI_RestrictedGlobalSettingsPages;
         /** Holds restricted Machine Settings pages. */
         extern const char* GUI_RestrictedMachineSettingsPages;
+    /** @} */
+
+    /** @name Settings: Display
+      * @{ */
+        /** Holds whether hovered machine-window should be activated. */
+        extern const char* GUI_ActivateHoveredMachineWindow;
     /** @} */
 

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

@@ -1757 +1757 @@
 #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
            << GUI_RestrictedGlobalSettingsPages << GUI_RestrictedMachineSettingsPages
+           << GUI_ActivateHoveredMachineWindow
            << GUI_Input_SelectorShortcuts << GUI_Input_MachineShortcuts
            << GUI_RecentFolderHD << GUI_RecentFolderCD << GUI_RecentFolderFD
@@ -2086 +2087 @@
 }
 
+bool UIExtraDataManager::activateHoveredMachineWindow()
+{
+    /* 'False' unless feature allowed: */
+    return isFeatureAllowed(GUI_ActivateHoveredMachineWindow);
+}
+
 QStringList UIExtraDataManager::shortcutOverrides(const QString &strPoolExtraDataID)
 {

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

@@ -163 +163 @@
         /** Returns restricted machine settings pages. */
         QList<MachineSettingsPageType> restrictedMachineSettingsPages(const QString &strID);
+    /** @} */
+
+    /** @name Settings: Display
+      * @{ */
+        /** Returns whether hovered machine-window should be activated. */
+        bool activateHoveredMachineWindow();
     /** @} */
 

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

@@ -36 +36 @@
 # include "UIMachineView.h"
 # include "UIFrameBuffer.h"
+# include "UIExtraDataManager.h"
 
 # ifdef Q_WS_WIN
@@ -614 +615 @@
 #endif /* Q_WS_X11 */
                     /* Check if we should activate window under cursor: */
-                    if (!uisession()->isMouseCaptured() &&
+                    if (gEDataManager->activateHoveredMachineWindow() &&
+                        !uisession()->isMouseCaptured() &&
                         QApplication::activeWindow() &&
                         m_windows.values().contains(QApplication::activeWindow()) &&