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

Timestamp:

Jan 22, 2018 4:41:57 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8694: Runtime UI: Make Unscaled HiDPI Output mode work with 3D support on Windows/X11 (well, generally).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp (modified) (4 diffs)

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

@@ -255 +255 @@
     if (machine().GetAccelerate3DEnabled() && vboxGlobal().is3DAvailable())
     {
+        double dScaleFactorFor3D = dScaleFactor;
+#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)
+            dScaleFactorFor3D *= frameBuffer()->devicePixelRatio();
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
         display().NotifyScaleFactorChange(m_uScreenId,
-                                          (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER),
-                                          (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER));
+                                          (uint32_t)(dScaleFactorFor3D * VBOX_OGL_SCALE_FACTOR_MULTIPLIER),
+                                          (uint32_t)(dScaleFactorFor3D * VBOX_OGL_SCALE_FACTOR_MULTIPLIER));
         display().NotifyHiDPIOutputPolicyChange(fUseUnscaledHiDPIOutput);
     }
@@ -487 +495 @@
     /* Take the scale-factor into account: */
     const double dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
+    const bool fUseUnscaledHiDPIOutput = gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid());
     frameBuffer()->setScaleFactor(dScaleFactor);
     /* Propagate the scale-factor to 3D service if necessary: */
     if (machine().GetAccelerate3DEnabled() && vboxGlobal().is3DAvailable())
     {
+        double dScaleFactorFor3D = dScaleFactor;
+#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)
+            dScaleFactorFor3D *= frameBuffer()->devicePixelRatio();
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
         display().NotifyScaleFactorChange(m_uScreenId,
-                                          (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER),
-                                          (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER));
+                                          (uint32_t)(dScaleFactorFor3D * VBOX_OGL_SCALE_FACTOR_MULTIPLIER),
+                                          (uint32_t)(dScaleFactorFor3D * VBOX_OGL_SCALE_FACTOR_MULTIPLIER));
     }
 
@@ -705 +722 @@
         m_pFrameBuffer->setScalingOptimizationType(gEDataManager->scalingOptimizationType(vboxGlobal().managedVMUuid()));
 
-        /* Take device-pixel-ratio into account: */
-        m_pFrameBuffer->setDevicePixelRatio(gpDesktop->devicePixelRatio(machineWindow()));
-
         /* Take the scale-factor related attributes into account: */
+        const double dDevicePixelRatio = gpDesktop->devicePixelRatio(machineWindow());
         const double dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
         const bool fUseUnscaledHiDPIOutput = gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid());
+        m_pFrameBuffer->setDevicePixelRatio(dDevicePixelRatio);
         m_pFrameBuffer->setScaleFactor(dScaleFactor);
         m_pFrameBuffer->setUseUnscaledHiDPIOutput(fUseUnscaledHiDPIOutput);
@@ -716 +732 @@
         if (machine().GetAccelerate3DEnabled() && vboxGlobal().is3DAvailable())
         {
+            double dScaleFactorFor3D = dScaleFactor;
+#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)
+                dScaleFactorFor3D *= dDevicePixelRatio;
+#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
             display().NotifyScaleFactorChange(m_uScreenId,
-                                              (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER),
-                                              (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER));
+                                              (uint32_t)(dScaleFactorFor3D * VBOX_OGL_SCALE_FACTOR_MULTIPLIER),
+                                              (uint32_t)(dScaleFactorFor3D * VBOX_OGL_SCALE_FACTOR_MULTIPLIER));
             display().NotifyHiDPIOutputPolicyChange(fUseUnscaledHiDPIOutput);
         }