Changeset 9076 in vbox for trunk

Timestamp:

May 23, 2008 12:17:07 PM (17 years ago)

Author:

vboxsync

Message:

Frontends/VirtualBox and VirtualBox4: revert r31170 until after 1.6.2

Location:

trunk/src/VBox/Frontends

Files:

• VirtualBox/src/VBoxConsoleView.cpp (modified) (6 diffs)
• VirtualBox4/src/VBoxConsoleView.cpp (modified) (6 diffs)

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

@@ -998 +998 @@
         maybeRestrictMinimumSize();
 
-        if (mAutoresizeGuest)
+        if (mGuestSupportsGraphics && mAutoresizeGuest)
             doResizeHint();
     }
@@ -1558 +1558 @@
                  * when (and only when) the autoresize property is "true". */
                 mDoResize = mGuestSupportsGraphics || mMainWnd->isTrueFullscreen();
-                if (!mIgnoreMainwndResize && mAutoresizeGuest)
+                if (!mIgnoreMainwndResize &&
+                    mGuestSupportsGraphics && mAutoresizeGuest)
                     resize_hint_timer->start (300, TRUE);
                 break;
@@ -2247 +2248 @@
 void VBoxConsoleView::toggleFSMode (const QSize &aSize)
 {
-    if (mAutoresizeGuest || mMainWnd->isTrueFullscreen())
+    if ((mGuestSupportsGraphics && mAutoresizeGuest) ||
+        mMainWnd->isTrueFullscreen())
     {
         QSize newSize;
@@ -2288 +2290 @@
 bool VBoxConsoleView::isAutoresizeGuestActive()
 {
-    return mAutoresizeGuest;
+    return mGuestSupportsGraphics && mAutoresizeGuest;
 }
 
@@ -3547 +3549 @@
 void VBoxConsoleView::doResizeHint (const QSize &aToSize)
 {
-    if (mAutoresizeGuest)
+    if (mGuestSupportsGraphics && mAutoresizeGuest)
     {
         /* If this slot is invoked directly then use the passed size
@@ -3665 +3667 @@
     if (mode == VBoxDefs::SDLMode)
     {
-        if (!mAutoresizeGuest)
+        if (!mGuestSupportsGraphics || !mAutoresizeGuest)
             setMinimumSize (sizeHint());
         else

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

@@ -1026 +1026 @@
         maybeRestrictMinimumSize();
 
-        if (mAutoresizeGuest)
+        if (mGuestSupportsGraphics && mAutoresizeGuest)
             doResizeHint();
     }
@@ -1595 +1595 @@
                  * when (and only when) the autoresize property is "true". */
                 mDoResize = mGuestSupportsGraphics || mMainWnd->isTrueFullscreen();
-                if (!mIgnoreMainwndResize && mAutoresizeGuest)
+                if (!mIgnoreMainwndResize &&
+                    mGuestSupportsGraphics && mAutoresizeGuest)
                     QTimer::singleShot (300, this, SLOT (doResizeHint()));
                 break;
@@ -2277 +2278 @@
 void VBoxConsoleView::toggleFSMode (const QSize &aSize)
 {
-    if (mAutoresizeGuest || mMainWnd->isTrueFullscreen())
+    if ((mGuestSupportsGraphics && mAutoresizeGuest) ||
+        mMainWnd->isTrueFullscreen())
     {
         QSize newSize;
@@ -2318 +2320 @@
 bool VBoxConsoleView::isAutoresizeGuestActive()
 {
-    return mAutoresizeGuest;
+    return mGuestSupportsGraphics && mAutoresizeGuest;
 }
 
@@ -3569 +3571 @@
 void VBoxConsoleView::doResizeHint (const QSize &aToSize)
 {
-    if (mAutoresizeGuest)
+    if (mGuestSupportsGraphics && mAutoresizeGuest)
     {
         /* If this slot is invoked directly then use the passed size
@@ -3687 +3689 @@
     if (mode == VBoxDefs::SDLMode)
     {
-        if (!mAutoresizeGuest)
+        if (!mGuestSupportsGraphics || !mAutoresizeGuest)
             setMinimumSize (sizeHint());
         else