Changeset 53860 in vbox

Timestamp:

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

Author:

vboxsync

Message:

FE/Qt: 6278: Subsequent frame-buffer cleanup.

Location:

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

Files:

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

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

@@ -62 +62 @@
     , m_fUnused(false)
     , m_fAutoEnabled(false)
-    , m_dScaleFactor(gEDataManager->scaleFactor(vboxGlobal().managedVMUuid()))
-    , m_fUseUnscaledHiDPIOutput(gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid()))
+    , m_dScaleFactor(1.0)
+    , m_dBackingScaleFactor(1.0)
+    , m_fUseUnscaledHiDPIOutput(false)
     , m_hiDPIOptimizationType(HiDPIOptimizationType_None)
-    , m_dBackingScaleFactor(1.0)
 {
     /* Update coordinate-system: */
@@ -695 +695 @@
 
     unlock();
+
+    /* Update scaled-size according scale-factor: */
+    setScaledSize(scaleFactor() == 1.0 ? scaledSize() : QSize(m_iWidth * scaleFactor(), m_iHeight * scaleFactor()));
 }
 
@@ -772 +775 @@
 
     /* Update scaled-size according scale-factor: */
-    setScaledSize(m_dScaleFactor == 1.0 ? QSize() : QSize(m_iWidth * dScaleFactor, m_iHeight * dScaleFactor));
+    setScaledSize(scaleFactor() == 1.0 ? QSize() : QSize(m_iWidth * scaleFactor(), m_iHeight * scaleFactor()));
 
     /* Update coordinate-system: */
@@ -975 +978 @@
     QPixmap subPixmap = QPixmap(rect.width(), rect.height());
 
-    /* If HiDPI 'backing scale factor' defined: */
+    /* If HiDPI 'backing-scale-factor' defined: */
     if (dBackingScaleFactor > 1.0)
     {
@@ -1035 +1038 @@
     QPixmap subPixmap = QPixmap::fromImage(subImage);
 
-    /* If HiDPI 'backing scale factor' defined: */
+    /* If HiDPI 'backing-scale-factor' defined: */
     if (dBackingScaleFactor > 1.0)
     {

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

@@ -214 +214 @@
 #endif /* VBOX_WITH_VIDEOHWACCEL */
 
+    /** 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);
+
+    /** Returns backing-scale-factor used by HiDPI frame-buffer. */
+    double backingScaleFactor() const { return m_dBackingScaleFactor; }
+    /** Defines backing-scale-factor used by HiDPI frame-buffer. */
+    void setBackingScaleFactor(double dBackingScaleFactor);
+
     /** Returns whether frame-buffer should use unscaled HiDPI output. */
     bool useUnscaledHiDPIOutput() const { return m_fUseUnscaledHiDPIOutput; }
@@ -221 +231 @@
     /** Define HiDPI frame-buffer optimization type: */
     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; }
-    /** Define backing scale factor used by HiDPI frame-buffer. */
-    void setBackingScaleFactor(double dBackingScaleFactor);
 
 protected slots:
@@ -330 +330 @@
     /** @name HiDPI screens related variables.
      * @{ */
+    /** Holds backing-scale-factor used by HiDPI frame-buffer. */
+    double m_dBackingScaleFactor;
     /** Holds whether frame-buffer should use unscaled HiDPI output. */
     bool m_fUseUnscaledHiDPIOutput;
     /** Holds HiDPI frame-buffer optimization type. */
     HiDPIOptimizationType m_hiDPIOptimizationType;
-    /** Holds backing scale factor used by HiDPI frame-buffer. */
-    double m_dBackingScaleFactor;
     /** @} */