Changeset 70627 in vbox

Timestamp:

Jan 18, 2018 11:40:45 AM (7 years ago)

Author:

vboxsync

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

120351

Message:

FE/Qt: bugref:8694: Runtime UI: Make Scaled mode and Unscaled HiDPI Output mode work together.

Location:

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

Files:

• UIMachineView.cpp (modified) (2 diffs)
• scale/UIMachineViewScale.cpp (modified) (1 diff)

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

@@ -357 +357 @@
     {
         /* Assign new frame-buffer logical-size: */
-        frameBuffer()->setScaledSize(size());
+        QSize scaledSize = size();
+        const double dDevicePixelRatio = frameBuffer()->devicePixelRatio();
+        if (dDevicePixelRatio > 1.0 && frameBuffer()->useUnscaledHiDPIOutput())
+            scaledSize *= dDevicePixelRatio;
+        frameBuffer()->setScaledSize(scaledSize);
 
         /* Forget the last full-screen size: */
@@ -1047 +1051 @@
         {
             /* Assign new frame-buffer logical-size: */
-            frameBuffer()->setScaledSize(size());
+            QSize scaledSize = size();
+            const double dDevicePixelRatio = frameBuffer()->devicePixelRatio();
+            if (dDevicePixelRatio > 1.0 && frameBuffer()->useUnscaledHiDPIOutput())
+                scaledSize *= dDevicePixelRatio;
+            frameBuffer()->setScaledSize(scaledSize);
         }
         /* For other than 'scale' mode: */

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

@@ -62 +62 @@
 void UIMachineViewScale::sltPerformGuestScale()
 {
-    /* Adjust frame-buffer scaled-size: */
-    frameBuffer()->setScaledSize(size());
+    /* Assign new frame-buffer logical-size: */
+    QSize scaledSize = size();
+    const double dDevicePixelRatio = frameBuffer()->devicePixelRatio();
+    if (dDevicePixelRatio > 1.0 && frameBuffer()->useUnscaledHiDPIOutput())
+        scaledSize *= dDevicePixelRatio;
+    frameBuffer()->setScaledSize(scaledSize);
     frameBuffer()->performRescale();
 
     /* If scaled-size is valid: */
-    const QSize scaledSize = frameBuffer()->scaledSize();
     if (scaledSize.isValid())
     {