Changeset 54103 in vbox for trunk/src/VBox/Frontends

Timestamp:

Feb 6, 2015 6:22:59 PM (10 years ago)

Author:

vboxsync

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

98074

Message:

FE/Qt: 3635: Scaling mode support: 2D Video Acceleration: Pass actual visual-state-type instead of stale one.

Location:

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

Files:

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

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

@@ -56 +56 @@
 
 UIFrameBuffer::UIFrameBuffer()
-    : m_visualState(UIVisualStateType_Invalid)
-    , m_iWidth(0), m_iHeight(0)
+    : m_iWidth(0), m_iHeight(0)
     , m_pMachineView(NULL)
     , m_iWinId(0)
@@ -76 +75 @@
     LogRel2(("UIFrameBuffer::init %p\n", this));
 
-    /* Fetch visual-state: */
-    m_visualState = pMachineView->visualStateType();
-
     /* Assign mahine-view: */
     m_pMachineView = pMachineView;
@@ -150 +146 @@
     m_fUnused = fUnused;
     unlock();
+}
+
+UIVisualStateType UIFrameBuffer::visualState() const
+{
+    return m_pMachineView ? m_pMachineView->visualStateType() : UIVisualStateType_Invalid;
 }
 

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

@@ -77 +77 @@
     void setMarkAsUnused(bool fUnused);
 
-    /** Returns the visual-state this frame-buffer created for. */
-    UIVisualStateType visualState() const { return m_visualState; }
+    /** Returns the visual-state this frame-buffer is used for. */
+    UIVisualStateType visualState() const;
 
     /** Returns whether frame-buffer is <b>auto-enabled</b>.
@@ -264 +264 @@
                               HiDPIOptimizationType hiDPIOptimizationType,
                               double dBackingScaleFactor);
-
-    /** Holds the visual-state this frame-buffer created for. */
-    UIVisualStateType m_visualState;
 
     /** Holds the QImage buffer. */