Changeset 9070 in vbox for trunk/src

Timestamp:

May 23, 2008 11:36:46 AM (17 years ago)

Author:

vboxsync

Message:

Frontends/VirtualBox and VirtualBox4: mAutoresizeGuest implies mGuestSupportsGraphics

Location:

trunk/src/VBox/Frontends

Files:

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

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

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

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

@@ -1033 +1033 @@
         maybeRestrictMinimumSize();
 
-        if (mGuestSupportsGraphics && mAutoresizeGuest)
+        if (mAutoresizeGuest)
             doResizeHint();
     }
@@ -1605 +1605 @@
                  * when (and only when) the autoresize property is "true". */
                 mDoResize = mGuestSupportsGraphics || mMainWnd->isTrueFullscreen();
-                if (!mIgnoreMainwndResize &&
-                    mGuestSupportsGraphics && mAutoresizeGuest)
+                if (!mIgnoreMainwndResize && mAutoresizeGuest)
                     QTimer::singleShot (300, this, SLOT (doResizeHint()));
                 break;
@@ -2288 +2287 @@
 void VBoxConsoleView::toggleFSMode()
 {
-    if ((mGuestSupportsGraphics && mAutoresizeGuest) ||
-        mMainWnd->isTrueFullscreen())
+    if (mAutoresizeGuest || mMainWnd->isTrueFullscreen())
     {
         QSize newSize = QSize();
@@ -2301 +2299 @@
         doResizeHint (newSize);
     }
-    /* Currently there is 2000 msec pause before timer transfers
-     * console into desired mode "if GA are active and auto-resize
-     * feature enabled" and 100 msec pause before it transfers
-     * console into this mode "if GA are not active or auto-resize
-     * feature disabled". 100 msec pause required for resizing
+    /* Currently there is a 2000 msec pause before timer transfers
+     * console into desired mode if the auto-resize feature is enabled
+     * and a 100 msec pause before it transfers console into this mode
+     * if it is not enabled. 100 msec pause required for resizing
      * before normalizing geometry. */
-    mToggleFSModeTimer->start (mGuestSupportsGraphics && mAutoresizeGuest ?
-        2000 : 100);
+    mToggleFSModeTimer->start (mAutoresizeGuest ? 2000 : 100);
 
     /// @todo (r=dsen) perform roll-back after 'entering' mode in case
@@ -2341 +2337 @@
 bool VBoxConsoleView::isAutoresizeGuestActive()
 {
-    return mGuestSupportsGraphics && mAutoresizeGuest;
+    return mAutoresizeGuest;
 }
 
@@ -3592 +3588 @@
 void VBoxConsoleView::doResizeHint (const QSize &aToSize)
 {
-    if (mGuestSupportsGraphics && mAutoresizeGuest)
+    if (mAutoresizeGuest)
     {
         /* If this slot is invoked directly then use the passed size
@@ -3710 +3706 @@
     if (mode == VBoxDefs::SDLMode)
     {
-        if (!mGuestSupportsGraphics || !mAutoresizeGuest)
+        if (!mAutoresizeGuest)
             setMinimumSize (sizeHint());
         else