Changeset 76016 in vbox for trunk/src

Timestamp:

Dec 6, 2018 2:41:00 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8694: UIMachineView: Reapply both device-pixel-ratio and scale-factor while moving window form one host-screen to another.

File:

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

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

@@ -247 +247 @@
 void UIMachineView::applyMachineViewScaleFactor()
 {
+    /* Sanity check: */
+    if (!frameBuffer())
+        return;
+
     /* Acquire selected scale-factor: */
     double dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid(), m_uScreenId);
 
     /* Take the device-pixel-ratio into account: */
+    frameBuffer()->setDevicePixelRatio(gpDesktop->devicePixelRatio(machineWindow()));
+    frameBuffer()->setDevicePixelRatioActual(gpDesktop->devicePixelRatioActual(machineWindow()));
     const double dDevicePixelRatioActual = frameBuffer()->devicePixelRatioActual();
     const bool fUseUnscaledHiDPIOutput = dScaleFactor != dDevicePixelRatioActual;
@@ -609 +615 @@
                 }
             }
-            /* Reapply machine-view scale-factor if necessary: */
-            if (m_pFrameBuffer)
-                applyMachineViewScaleFactor();
+            /* Reapply machine-view scale-factor: */
+            applyMachineViewScaleFactor();
             break;
         }
@@ -1464 +1469 @@
                     /* Recache current host screen: */
                     m_iHostScreenNumber = iCurrentHostScreenNumber;
-
-                    /* Update frame-buffer arguments: */
-                    if (m_pFrameBuffer)
-                    {
-                        /* Update device-pixel-ratio for underlying frame-buffer: */
-                        m_pFrameBuffer->setDevicePixelRatio(gpDesktop->devicePixelRatio(machineWindow()));
-                        m_pFrameBuffer->setDevicePixelRatioActual(gpDesktop->devicePixelRatioActual(machineWindow()));
-                        /* Perform frame-buffer rescaling: */
-                        m_pFrameBuffer->performRescale();
-                    }
-
-                    /* Update console's display viewport and 3D overlay: */
-                    updateViewport();
+                    /* Reapply machine-view scale-factor if necessary: */
+                    applyMachineViewScaleFactor();
                 }
                 break;