Changeset 9053 in vbox for trunk/src

Timestamp:

May 22, 2008 1:13:33 PM (17 years ago)

Author:

vboxsync

Message:

reverted r31118 and applied Michaels last patch (#2844#22) as a better solution

Location:

trunk/src/VBox/Frontends

Files:

• VirtualBox/include/VBoxConsoleView.h (modified) (1 diff)
• VirtualBox/src/VBoxConsoleView.cpp (modified) (4 diffs)
• VirtualBox/src/VBoxConsoleWnd.cpp (modified) (1 diff)
• VirtualBox4/include/VBoxConsoleView.h (modified) (1 diff)
• VirtualBox4/src/VBoxConsoleView.cpp (modified) (4 diffs)
• VirtualBox4/src/VBoxConsoleWnd.cpp (modified) (1 diff)

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

@@ -239 +239 @@
     bool mIgnoreMainwndResize : 1;
     bool mAutoresizeGuest : 1;
+    bool mDoResize : 1;
 
     bool mGuestSupportsGraphics : 1;

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

@@ -629 +629 @@
     , mIgnoreMainwndResize (true)
     , mAutoresizeGuest (false)
+    , mDoResize (false)
     , mGuestSupportsGraphics (false)
     , mNumLock (false)
@@ -1554 +1555 @@
             case QEvent::Resize:
             {
+                /* Set the "guest needs to resize" hint.  This hint is acted upon
+                 * when (and only when) the autoresize property is set to "true". */
+                mDoResize = mGuestSupportsGraphics || mMainWnd->isTrueFullscreen();
                 if (!mIgnoreMainwndResize &&
                     mGuestSupportsGraphics && mAutoresizeGuest)
@@ -3545 +3549 @@
 void VBoxConsoleView::doResizeHint (const QSize &aToSize)
 {
-    if ((mGuestSupportsGraphics && mAutoresizeGuest) ||
-        mMainWnd->isTrueFullscreen())
+    if (mGuestSupportsGraphics && mAutoresizeGuest)
     {
         /* If this slot is invoked directly then use the passed size
@@ -3555 +3558 @@
         if (!aToSize.isValid())
             sz -= QSize (frameWidth() * 2, frameWidth() * 2);
-        LogFlowFunc (("Will suggest %d x %d\n", sz.width(), sz.height()));
-
-        /* Increase the desktop geometry if needed */
-        setDesktopGeoHint (sz.width(), sz.height());
-
-        if (mAutoresizeGuest)
+        if (mAutoresizeGuest &&
+            (aToSize.isValid() || mDoResize))
+        {
+            LogFlowFunc (("Will suggest %d x %d\n", sz.width(), sz.height()));
+
+            /* Increase the desktop geometry if needed */
+            setDesktopGeoHint (sz.width(), sz.height());
+
             mConsole.GetDisplay().SetVideoModeHint (sz.width(), sz.height(), 0, 0);
+        }
     }
 }

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

@@ -3261 +3261 @@
             toggleFullscreenMode (true, true);
         /* Disable auto-resizing if advanced graphics are not available */
-        /* See #2844#c10. This is just not necessary here and may lead to
-         * invalid video mode hints. */
-#if 0
         console->setAutoresizeGuest (   mIsGraphicsSupported
                                      && vmAutoresizeGuestAction->isOn());
-#endif
         vmAutoresizeGuestAction->setEnabled (mIsGraphicsSupported);
     }

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

@@ -257 +257 @@
     bool mIgnoreMainwndResize : 1;
     bool mAutoresizeGuest : 1;
+    bool mDoResize : 1;
 
     bool mGuestSupportsGraphics : 1;

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

@@ -650 +650 @@
     , mIgnoreMainwndResize (true)
     , mAutoresizeGuest (false)
+    , mDoResize (false)
     , mGuestSupportsGraphics (false)
     , mNumLock (false)
@@ -1601 +1602 @@
             case QEvent::Resize:
             {
+                /* Set the "guest needs to resize" hint.  This hint is acted upon
+                 * when (and only when) the autoresize property is set to "true". */
+                mDoResize = mGuestSupportsGraphics || mMainWnd->isTrueFullscreen();
                 if (!mIgnoreMainwndResize &&
                     mGuestSupportsGraphics && mAutoresizeGuest)
@@ -3574 +3578 @@
 void VBoxConsoleView::doResizeHint (const QSize &aToSize)
 {
-    if ((mGuestSupportsGraphics && mAutoresizeGuest) ||
-        mMainWnd->isTrueFullscreen())
+    if (mGuestSupportsGraphics && mAutoresizeGuest)
     {
         /* If this slot is invoked directly then use the passed size
@@ -3584 +3587 @@
         if (!aToSize.isValid())
             sz -= QSize (frameWidth() * 2, frameWidth() * 2);
-        LogFlowFunc (("Will suggest %d x %d\n", sz.width(), sz.height()));
-
-        /* Increase the desktop geometry if needed */
-        setDesktopGeoHint (sz.width(), sz.height());
-
-        if (mAutoresizeGuest)
+        if (mAutoresizeGuest &&
+            (aToSize.isValid() || mDoResize))
+        {
+            LogFlowFunc (("Will suggest %d x %d\n", sz.width(), sz.height()));
+
+            /* Increase the desktop geometry if needed */
+            setDesktopGeoHint (sz.width(), sz.height());
+
             mConsole.GetDisplay().SetVideoModeHint (sz.width(), sz.height(), 0, 0);
+        }
     }
 }

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

@@ -3323 +3323 @@
             toggleFullscreenMode (true, true);
         /* Disable auto-resizing if advanced graphics are not available */
-        /* See #2844#c10. This is just not necessary here and may lead to
-         * invalid video mode hints. */
-#if 0
         console->setAutoresizeGuest (   mIsGraphicsSupported
                                      && vmAutoresizeGuestAction->isChecked());
-#endif
         vmAutoresizeGuestAction->setEnabled (mIsGraphicsSupported);
     }