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

Timestamp:

Oct 24, 2011 3:46:58 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: slightly cleaner hack for inhibiting unwanted resizes when exiting fullscreen and seamless

Location:

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

Files:

• UIMachineView.cpp (modified) (2 diffs)
• UIMachineView.h (modified) (1 diff)
• normal/UIMachineViewNormal.cpp (modified) (1 diff)

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

@@ -556 +556 @@
 QSize UIMachineView::sizeHint() const
 {
+    if (m_sizeHintOverride.isValid())
+        return m_sizeHintOverride;
 #ifdef VBOX_WITH_DEBUGGER
     // TODO: Fix all DEBUGGER stuff!
@@ -858 +860 @@
         /* Reapply maximum size restriction for machine-view: */
         setMaximumSize(sizeHint());
+
+        /* Disable the resize hint override hack: */
+        m_sizeHintOverride = QSize(-1, -1);
 
         /* Perform machine-view resize: */

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

@@ -197 +197 @@
     UIFrameBuffer *m_pFrameBuffer;
     KMachineState m_previousState;
+    /** HACK: when switching out of fullscreen or seamless we wish to override
+     * the default size hint to avoid short resizes back to fullscreen size.
+     * Not explicitly initialised (i.e. invalid by default). */
+    QSize m_sizeHintOverride;
 
     /** The policy for calculating the maximum guest resolution which we wish

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp

@@ -215 +215 @@
              * the following resize() is acted upon. */
             setMaximumSize(hint);
-            resize(hint);
+            m_sizeHintOverride = hint;
             sltPerformGuestResize(hint);
         }