Changeset 53859 in vbox

Timestamp:

Jan 19, 2015 3:15:32 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 6278: Support for scaled video-output: Managing frame-buffer scaled-size from within the machine-view through scale-factor API.

Location:

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

Files:

• UIFrameBuffer.cpp (modified) (3 diffs)
• UIFrameBuffer.h (modified) (3 diffs)
• UIMachineView.cpp (modified) (3 diffs)

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

@@ -766 +766 @@
 #endif /* VBOX_WITH_VIDEOHWACCEL */
 
+void UIFrameBuffer::setScaleFactor(double dScaleFactor)
+{
+    /* Remember new scale-factor: */
+    m_dScaleFactor = dScaleFactor;
+
+    /* Update scaled-size according scale-factor: */
+    setScaledSize(m_dScaleFactor == 1.0 ? QSize() : QSize(m_iWidth * dScaleFactor, m_iHeight * dScaleFactor));
+
+    /* Update coordinate-system: */
+    updateCoordinateSystem();
+}
+
 void UIFrameBuffer::setBackingScaleFactor(double dBackingScaleFactor)
 {
     /* Remember new backing-scale-factor: */
     m_dBackingScaleFactor = dBackingScaleFactor;
-
-    /* Update coordinate-system: */
-    updateCoordinateSystem();
-}
-
-void UIFrameBuffer::sltHandleScaleFactorChange(const QString &strMachineID)
-{
-    /* Skip unrelated machine IDs: */
-    if (strMachineID != vboxGlobal().managedVMUuid())
-        return;
-
-    /* Fetch new scale-factor: */
-    m_dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
 
     /* Update coordinate-system: */
@@ -820 +819 @@
 
     /* Extra-data manager connections: */
-    connect(gEDataManager, SIGNAL(sigScaleFactorChange(const QString&)),
-            this, SLOT(sltHandleScaleFactorChange(const QString&)));
 #ifdef Q_WS_MAC
     connect(gEDataManager, SIGNAL(sigUnscaledHiDPIOutputModeChange(const QString&)),
@@ -841 +838 @@
 
     /* Extra-data manager connections: */
-    disconnect(gEDataManager, SIGNAL(sigScaleFactorChange(const QString&)),
-               this, SLOT(sltHandleScaleFactorChange(const QString&)));
 #ifdef Q_WS_MAC
     disconnect(gEDataManager, SIGNAL(sigUnscaledHiDPIOutputModeChange(const QString&)),

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

@@ -183 +183 @@
     void unlock() const { RTCritSectLeave(&m_critSect); }
 
-    /** Returns the scale-factor used by the scaled-size. */
-    double scaleFactor() const { return m_dScaleFactor; }
     /** Returns the frame-buffer's scaled-size. */
     QSize scaledSize() const { return m_scaledSize; }
@@ -224 +222 @@
     void setHiDPIOptimizationType(HiDPIOptimizationType optimizationType) { m_hiDPIOptimizationType = optimizationType; }
 
+    /** Returns the scale-factor used by the frame-buffer. */
+    double scaleFactor() const { return m_dScaleFactor; }
+    /** Define the scale-factor used by the frame-buffer. */
+    void setScaleFactor(double dScaleFactor);
+
     /** Return backing scale factor used by HiDPI frame-buffer. */
     double backingScaleFactor() const { return m_dBackingScaleFactor; }
@@ -230 +233 @@
 
 protected slots:
-
-    /** Handles the scale-factor change. */
-    void sltHandleScaleFactorChange(const QString &strMachineID);
 
 #ifdef RT_OS_DARWIN

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

@@ -239 +239 @@
             /* Assign new frame-buffer logical-size taking the scale-factor into account: */
             const double dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
-            frameBuffer()->setScaledSize(dScaleFactor == 1.0 ? QSize() : QSize(iWidth * dScaleFactor, iHeight * dScaleFactor));
+            frameBuffer()->setScaleFactor(dScaleFactor);
             display().NotifyScaleFactorChange(m_uScreenId,
                                               (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER),
@@ -511 +511 @@
 # endif /* !VBOX_WITH_VIDEOHWACCEL */
         m_pFrameBuffer->setHiDPIOptimizationType(uisession()->hiDPIOptimizationType());
-        m_pFrameBuffer->setScaledSize(dScaleFactor == 1.0 ? QSize() :
-                                      QSize(m_pFrameBuffer->width() * dScaleFactor,
-                                            m_pFrameBuffer->height() * dScaleFactor));
+        m_pFrameBuffer->setScaleFactor(dScaleFactor);
         display().NotifyScaleFactorChange(m_uScreenId,
                                           (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER),
@@ -559 +557 @@
     {
         frameBuffer()->resizeEvent(size.width(), size.height());
-        frameBuffer()->setScaledSize(dScaleFactor == 1 ? QSize() :
-                                     QSize(frameBuffer()->width() * dScaleFactor,
-                                           frameBuffer()->height() * dScaleFactor));
+        frameBuffer()->setScaleFactor(dScaleFactor);
         display().NotifyScaleFactorChange(m_uScreenId,
                                           (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER),