Changeset 53518 in vbox

Timestamp:

Dec 12, 2014 10:33:35 AM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 6278: Support for scaled video-output: Seamless mode: Call for coordinate-system update on backing-scale-factor changes and Retina reflection policy changes.

Location:

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

Files:

• UIFrameBuffer.cpp (modified) (4 diffs)
• UIFrameBuffer.h (modified) (1 diff)

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

@@ -479 +479 @@
     }
     /* Tune according scale-factor: */
-    if (m_dScaleFactor != 1.0)
+    if (m_dScaleFactor != 1.0 || backingScaleFactor() > 1.0)
         region = m_transform.map(region);
 
@@ -766 +766 @@
 #endif /* VBOX_WITH_VIDEOHWACCEL */
 
+void UIFrameBuffer::setBackingScaleFactor(double dBackingScaleFactor)
+{
+    /* Remember new backing-scale-factor: */
+    m_dBackingScaleFactor = dBackingScaleFactor;
+
+    /* Update coordinate-system: */
+    updateCoordinateSystem();
+}
+
 void UIFrameBuffer::sltHandleScaleFactorChange(const QString &strMachineID)
 {
@@ -788 +797 @@
     /* Fetch new unscaled HiDPI output mode value: */
     m_fUseUnscaledHiDPIOutput = gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid());
+
+    /* Update coordinate-system: */
+    updateCoordinateSystem();
 }
 #endif /* RT_OS_DARWIN */
@@ -845 +857 @@
     if (m_dScaleFactor != 1.0)
         m_transform = m_transform.scale(m_dScaleFactor, m_dScaleFactor);
+
+    /* Apply the backing-scale-factor if necessary: */
+    if (useUnscaledHiDPIOutput() && backingScaleFactor() > 1.0)
+        m_transform = m_transform.scale(1.0 / backingScaleFactor(), 1.0 / backingScaleFactor());
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.h

@@ -225 +225 @@
     double backingScaleFactor() const { return m_dBackingScaleFactor; }
     /** Define backing scale factor used by HiDPI frame-buffer. */
-    void setBackingScaleFactor(double dBackingScaleFactor) { m_dBackingScaleFactor = dBackingScaleFactor; }
+    void setBackingScaleFactor(double dBackingScaleFactor);
 
 protected slots: