Changeset 53863 in vbox

Timestamp:

Jan 19, 2015 6:48:18 PM (10 years ago)

Author:

vboxsync

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

97697

Message:

FE/Qt: Mac OS X: 6278: Support for unscaled HiDPI (Retina) video-output: Pausing/restoring screenshots support.

File:

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

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

@@ -882 +882 @@
     /* Finally copy the screen-shot to pause-pixmap: */
     m_pausePixmap = QPixmap::fromImage(screenShot);
+#ifdef Q_WS_MAC
+    /* Adjust-backing-scale-factor if necessary: */
+    const double dBackingScaleFactor = frameBuffer()->backingScaleFactor();
+    if (dBackingScaleFactor > 1.0 && frameBuffer()->useUnscaledHiDPIOutput())
+        m_pausePixmap.setDevicePixelRatio(dBackingScaleFactor);
+#endif /* Q_WS_MAC */
 
     /* Update scaled pause pixmap: */
@@ -911 +917 @@
     /* Finally copy the screen-shot to pause-pixmap: */
     m_pausePixmap = QPixmap::fromImage(screenShot);
+#ifdef Q_WS_MAC
+    /* Adjust-backing-scale-factor if necessary: */
+    const double dBackingScaleFactor = frameBuffer()->backingScaleFactor();
+    if (dBackingScaleFactor > 1.0 && frameBuffer()->useUnscaledHiDPIOutput())
+        m_pausePixmap.setDevicePixelRatio(dBackingScaleFactor);
+#endif /* Q_WS_MAC */
 
     /* Update scaled pause pixmap: */
@@ -929 +941 @@
     /* Update pause pixmap finally: */
     m_pausePixmapScaled = pausePixmap().scaled(scaledSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+#ifdef Q_WS_MAC
+    /* Adjust-backing-scale-factor if necessary: */
+    const double dBackingScaleFactor = frameBuffer()->backingScaleFactor();
+    if (dBackingScaleFactor > 1.0 && frameBuffer()->useUnscaledHiDPIOutput())
+        m_pausePixmapScaled.setDevicePixelRatio(dBackingScaleFactor);
+#endif /* Q_WS_MAC */
 }
 
@@ -1183 +1201 @@
         /* Take the scale-factor into account: */
         if (gEDataManager->scaleFactor(vboxGlobal().managedVMUuid()) == 1.0)
-            painter.drawPixmap(rect, pausePixmap(), QRect(rect.x() + contentsX(), rect.y() + contentsY(),
-                                                          rect.width(), rect.height()));
+            painter.drawPixmap(rect.topLeft(), pausePixmap());
         else
-            painter.drawPixmap(rect, pausePixmapScaled(), QRect(rect.x() + contentsX(), rect.y() + contentsY(),
-                                                                rect.width(), rect.height()));
+            painter.drawPixmap(rect.topLeft(), pausePixmapScaled());
 #ifdef Q_WS_MAC
         /* Update the dock icon: */