Changeset 24488 in vbox for trunk/src

Timestamp:

Nov 9, 2009 11:12:31 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: 3616: Guru meditation triggers VM window resize: Ignoring initial VGA resize request in case of GM.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleView.h (modified) (2 diffs)
• src/VBoxConsoleView.cpp (modified) (2 diffs)
• src/VBoxConsoleWnd.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleView.h

@@ -113 +113 @@
 
     void setIgnoreMainwndResize (bool aYes) { mIgnoreMainwndResize = aYes; }
+    void setIgnoreGuestResize (bool aYes) { mIgnoreGuestResize = aYes; }
 
     QRect desktopGeometry();
@@ -293 +294 @@
     bool mAutoresizeGuest : 1;
     bool mIgnoreFrameBufferResize : 1;
+    bool mIgnoreGuestResize : 1;
 
     /**

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

@@ -724 +724 @@
     , mAutoresizeGuest (false)
     , mIgnoreFrameBufferResize (false)
+    , mIgnoreGuestResize (false)
     , mDoResize (false)
     , mGuestSupportsGraphics (false)
@@ -1259 +1260 @@
             case VBoxDefs::ResizeEventType:
             {
+                /* Some situations require initial VGA Resize Request
+                 * to be ignored at all, leaving previous framebuffer,
+                 * console widget and vm window size preserved. */
+                if (mIgnoreGuestResize)
+                    return true;
+
                 bool oldIgnoreMainwndResize = mIgnoreMainwndResize;
                 mIgnoreMainwndResize = true;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -2585 +2585 @@
     if (guruMeditation)
     {
+        mConsole->setIgnoreGuestResize (true);
+
         CConsole console = mConsole->console();
         QString logFolder = console.GetMachine().GetLogFolder();