Changeset 76062 in vbox

Timestamp:

Dec 7, 2018 3:34:38 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8694: Provide UIActionPoolRuntime with information about current guest-to-host screen mapping; This allows to update View/Scale-factor menu (for that cases when host-screens have different device-pixel-ratios) accordingly.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPoolRuntime.cpp (modified) (4 diffs)
• globals/UIActionPoolRuntime.h (modified) (2 diffs)
• runtime/UIMachineView.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.cpp

@@ -3125 +3125 @@
 }
 
-void UIActionPoolRuntime::setHostScreenForGuestScreenMap(const QMap<int, int> &map)
-{
-    m_mapHostScreenForGuestScreen = map;
+void UIActionPoolRuntime::setHostScreenForGuestScreenMap(const QMap<int, int> &scheme)
+{
+    m_mapHostScreenForGuestScreen = scheme;
     m_invalidations << UIActionIndexRT_M_View << UIActionIndexRT_M_ViewPopup;
+}
+
+QMap<int, int> UIActionPoolRuntime::hostScreenForGuestScreenMap() const
+{
+    return m_mapHostScreenForGuestScreen;
 }
 
@@ -3300 +3305 @@
 }
 
-void UIActionPoolRuntime::sltHandleActionTriggerViewRescale(QAction *pAction)
+void UIActionPoolRuntime::sltHandleActionTriggerViewScreenRescale(QAction *pAction)
 {
     /* Make sure sender is valid: */
@@ -3984 +3989 @@
         /* Get device-pixel-ratio: */
         bool fDevicePixelRatioMentioned = false;
-        const double dDevicePixelRatioActual = qMin(gpDesktop->devicePixelRatioActual(),
+        const double dDevicePixelRatioActual = qMin(gpDesktop->devicePixelRatioActual(m_mapHostScreenForGuestScreen.value(iGuestScreenIndex)),
                                                     10.0 /* meh, who knows? */);
 
@@ -4045 +4050 @@
         /* Install listener for exclusive action-group: */
         connect(pActionGroup, &QActionGroup::triggered,
-                this, &UIActionPoolRuntime::sltHandleActionTriggerViewRescale);
+                this, &UIActionPoolRuntime::sltHandleActionTriggerViewScreenRescale);
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.h

@@ -166 +166 @@
     void setGuestSupportsGraphics(bool fSupports);
 
-    /** Defines host-to-guest mapping scheme. */
-    void setHostScreenForGuestScreenMap(const QMap<int, int> &map);
+    /** Defines host-to-guest mapping @a scheme. */
+    void setHostScreenForGuestScreenMap(const QMap<int, int> &scheme);
+    /** Returns host-to-guest mapping scheme. */
+    QMap<int, int> hostScreenForGuestScreenMap() const;
 
     /** Returns whether the action with passed @a type is allowed in the 'Machine' menu. */
@@ -211 +213 @@
     void sltHandleActionTriggerViewScreenRemap(QAction *pAction);
     /** Handles 'View' : 'Virtual Screen #' menu : 'Rescale' @a pAction trigger. */
-    void sltHandleActionTriggerViewRescale(QAction *pAction);
+    void sltHandleActionTriggerViewScreenRescale(QAction *pAction);
 
 protected:

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

@@ -28 +28 @@
 /* GUI includes: */
 # include "VBoxGlobal.h"
+# include "UIActionPoolRuntime.h"
 # include "UIDesktopWidgetWatchdog.h"
 # include "UIExtraDataManager.h"
@@ -1471 +1472 @@
                     /* Reapply machine-view scale-factor if necessary: */
                     applyMachineViewScaleFactor();
+                    /* For 'normal'/'scaled' visual state type: */
+                    if (   visualStateType() == UIVisualStateType_Normal
+                        || visualStateType() == UIVisualStateType_Scale)
+                    {
+                        /* Make sure action-pool is of 'runtime' type: */
+                        UIActionPoolRuntime *pActionPool = actionPool() && actionPool()->toRuntime() ? actionPool()->toRuntime() : 0;
+                        AssertPtr(pActionPool);
+                        if (pActionPool)
+                        {
+                            /* Inform action-pool about current guest-to-host screen mapping: */
+                            QMap<int, int> screenMap = pActionPool->hostScreenForGuestScreenMap();
+                            screenMap[m_uScreenId] = m_iHostScreenNumber;
+                            pActionPool->setHostScreenForGuestScreenMap(screenMap);
+                        }
+                    }
                 }
                 break;