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

Timestamp:

Feb 13, 2018 11:56:54 AM (7 years ago)

Author:

vboxsync

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

120842

Message:

FE/Qt: bugref:8694: Runtime UI: Few missed bits for 3D scaled mode support (s.a. r120416); this time for Unscaled HiDPI Output mode toggled off.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp

@@ -65 +65 @@
     QSize scaledSize = size();
     const double dDevicePixelRatio = frameBuffer()->devicePixelRatio();
-    if (dDevicePixelRatio > 1.0 && frameBuffer()->useUnscaledHiDPIOutput())
+    const bool fUseUnscaledHiDPIOutput = frameBuffer()->useUnscaledHiDPIOutput();
+    if (dDevicePixelRatio > 1.0 && fUseUnscaledHiDPIOutput)
         scaledSize *= dDevicePixelRatio;
     frameBuffer()->setScaledSize(scaledSize);
@@ -76 +77 @@
         if (machine().GetAccelerate3DEnabled() && vboxGlobal().is3DAvailable())
         {
-            const double xScaleFactor = (double)scaledSize.width()  / frameBuffer()->width();
-            const double yScaleFactor = (double)scaledSize.height() / frameBuffer()->height();
+            double xScaleFactor = (double)scaledSize.width()  / frameBuffer()->width();
+            double yScaleFactor = (double)scaledSize.height() / frameBuffer()->height();
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
+            // WORKAROUND:
+            // On Windows and Linux opposing to macOS it's only Qt which can auto scale up,
+            // not 3D overlay itself, so for auto scale-up mode we have to take that into account.
+            if (!fUseUnscaledHiDPIOutput)
+            {
+                xScaleFactor *= dDevicePixelRatio;
+                yScaleFactor *= dDevicePixelRatio;
+            }
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
             display().NotifyScaleFactorChange(m_uScreenId,
                                               (uint32_t)(xScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER),
@@ -118 +129 @@
     /* If scaled-size is valid: */
     const QSize scaledSize = frameBuffer()->scaledSize();
+    const double dDevicePixelRatio = frameBuffer()->devicePixelRatio();
+    const bool fUseUnscaledHiDPIOutput = frameBuffer()->useUnscaledHiDPIOutput();
     if (scaledSize.isValid())
     {
@@ -123 +136 @@
         if (machine().GetAccelerate3DEnabled() && vboxGlobal().is3DAvailable())
         {
-            const double xScaleFactor = (double)scaledSize.width()  / frameBuffer()->width();
-            const double yScaleFactor = (double)scaledSize.height() / frameBuffer()->height();
+            double xScaleFactor = (double)scaledSize.width()  / frameBuffer()->width();
+            double yScaleFactor = (double)scaledSize.height() / frameBuffer()->height();
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
+            // WORKAROUND:
+            // On Windows and Linux opposing to macOS it's only Qt which can auto scale up,
+            // not 3D overlay itself, so for auto scale-up mode we have to take that into account.
+            if (!fUseUnscaledHiDPIOutput)
+            {
+                xScaleFactor *= dDevicePixelRatio;
+                yScaleFactor *= dDevicePixelRatio;
+            }
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
             display().NotifyScaleFactorChange(m_uScreenId,
                                               (uint32_t)(xScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER),
@@ -132 +155 @@
 
     /* Take unscaled HiDPI output mode into account: */
-    const bool fUseUnscaledHiDPIOutput = gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid());
     frameBuffer()->setUseUnscaledHiDPIOutput(fUseUnscaledHiDPIOutput);
     /* Propagate unscaled-hidpi-output feature to 3D service if necessary: */