Changeset 54076 in vbox for trunk/src/VBox/Frontends

Timestamp:

Feb 5, 2015 5:17:31 AM (10 years ago)

Author:

vboxsync

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

98030

Message:

FE/Qt: Mac OS X: 6278: Support for unscaled HiDPI (Retina) video-output: Initialize frame-buffer with backing scale-factor early.

Location:

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

Files:

• UIMachineView.cpp (modified) (5 diffs)
• UIMouseHandler.cpp (modified) (1 diff)

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

@@ -549 +549 @@
                                           (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER));
 
+        /* Take backing scale-factor into account: */
+        m_pFrameBuffer->setBackingScaleFactor(darwinBackingScaleFactor(machineWindow()));
+
         /* Take unscaled HiDPI output mode into account: */
         const bool fUseUnscaledHiDPIOutput = gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid());
@@ -983 +986 @@
      * we should take the backing-scale-factor into account.
      * See also viewportToContents()... */
-    if (gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid()))
+    if (frameBuffer()->useUnscaledHiDPIOutput())
     {
         const double dBackingScaleFactor = frameBuffer()->backingScaleFactor();
@@ -1011 +1014 @@
      * we should take the backing-scale-factor into account.
      * See also updateSliders()... */
-    if (gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid()))
+    if (frameBuffer()->useUnscaledHiDPIOutput())
     {
         const double dBackingScaleFactor = frameBuffer()->backingScaleFactor();
@@ -1463 +1466 @@
 #ifdef Q_WS_MAC
     /* Take the backing-scale-factor into account: */
-    if (gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid()))
+    if (frameBuffer()->useUnscaledHiDPIOutput())
     {
         const double dBackingScaleFactor = frameBuffer()->backingScaleFactor();
@@ -1479 +1482 @@
 #ifdef Q_WS_MAC
     /* Take the backing-scale-factor into account: */
-    if (gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid()))
+    if (frameBuffer()->useUnscaledHiDPIOutput())
     {
         const double dBackingScaleFactor = frameBuffer()->backingScaleFactor();

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

@@ -944 +944 @@
 #ifdef Q_WS_MAC
             /* Take the backing-scale-factor into account: */
-            if (gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid()))
+            if (pFrameBuffer->useUnscaledHiDPIOutput())
             {
                 const double dBackingScaleFactor = pFrameBuffer->backingScaleFactor();