Changeset 53823 in vbox

Timestamp:

Jan 15, 2015 2:38:23 PM (10 years ago)

Author:

vboxsync

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

97632

Message:

E/Qt: Mac OS X: 6278: Support for unscaled HiDPI (Retina) video-output: 2D Video Acceleration support.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxFBOverlay.cpp (modified) (2 diffs)
• VBoxFBOverlay.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -46 +46 @@
 
 # include <VBox/VBoxGL2D.h>
+
+#ifdef Q_WS_MAC
+# include "VBoxUtils-darwin.h"
+#endif /* Q_WS_MAC */
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -4430 +4434 @@
     }
 
+#ifdef Q_WS_MAC
+    /* Take the backing-scale-factor into account: */
+    if (mSizeInfo.useUnscaledHiDPIOutput())
+    {
+        const double dBackingScaleFactor = darwinBackingScaleFactor(mpViewport->window());
+        if (dBackingScaleFactor > 1.0)
+        {
+            rect.moveTo(rect.topLeft() / dBackingScaleFactor - QPoint(1, 1));
+            rect.setSize(rect.size() / dBackingScaleFactor + QSize(2, 2));
+        }
+    }
+#endif /* Q_WS_MAC */
+
     /* we do not to miss notify updates, because we have to update bg textures for it,
      * so no not check for m_fUnused here,

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.h

@@ -1346 +1346 @@
         mPixelFormat(pFb->pixelFormat()), mVRAM(pFb->address()), mBitsPerPixel(pFb->bitsPerPixel()),
         mBytesPerLine(pFb->bytesPerLine()), mWidth(pFb->width()), mHeight(pFb->height()),
-        m_dScaleFactor(pFb->scaleFactor()), m_scaledSize(pFb->scaledSize()),
+        m_dScaleFactor(pFb->scaleFactor()), m_scaledSize(pFb->scaledSize()), m_fUseUnscaledHiDPIOutput(pFb->useUnscaledHiDPIOutput()),
         mUsesGuestVram(true) {}
 
@@ -1355 +1355 @@
         mPixelFormat(aPixelFormat), mVRAM(aVRAM), mBitsPerPixel(aBitsPerPixel),
         mBytesPerLine(aBytesPerLine), mWidth(aWidth), mHeight(aHeight),
+        m_dScaleFactor(1.0), m_scaledSize(QSize()), m_fUseUnscaledHiDPIOutput(false),
         mUsesGuestVram(bUsesGuestVram) {}
 
@@ -1365 +1366 @@
     double scaleFactor() const { return m_dScaleFactor; }
     QSize scaledSize() const { return m_scaledSize; }
+    bool useUnscaledHiDPIOutput() const { return m_fUseUnscaledHiDPIOutput; }
     bool usesGuestVram() const {return mUsesGuestVram;}
 
@@ -1377 +1379 @@
     double m_dScaleFactor;
     QSize m_scaledSize;
+    bool m_fUseUnscaledHiDPIOutput;
     bool mUsesGuestVram;
 };