Changeset 9048 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 22, 2008 6:16:10 AM (17 years ago)

Author:

vboxsync

Message:

Frontends/VirtualBox and VirtualBox4: whether or not the console view object should perform resize operations should depend on the state of the guest SUPPORTS_GRAPHICS capability, not on whether or not the Additions are present

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

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

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

@@ -240 +240 @@
     bool mAutoresizeGuest : 1;
 
-    bool mIsAdditionsActive : 1;
+    bool mGuestSupportsGraphics : 1;
 
     bool mNumLock : 1;

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

@@ -629 +629 @@
     , mIgnoreMainwndResize (true)
     , mAutoresizeGuest (false)
-    , mIsAdditionsActive (false)
+    , mGuestSupportsGraphics (false)
     , mNumLock (false)
     , mScrollLock (false)
@@ -997 +997 @@
         maybeRestrictMinimumSize();
 
-        if (mIsAdditionsActive && mAutoresizeGuest)
+        if (mGuestSupportsGraphics && mAutoresizeGuest)
             doResizeHint();
     }
@@ -1200 +1200 @@
                 LogFlowFunc (("AdditionsStateChangeEventType\n"));
 
-                mIsAdditionsActive = ge->additionActive();
+                mGuestSupportsGraphics = ge->supportsGraphics();
 
                 maybeRestrictMinimumSize();
@@ -1555 +1555 @@
             {
                 if (!mIgnoreMainwndResize &&
-                    mIsAdditionsActive && mAutoresizeGuest)
+                    mGuestSupportsGraphics && mAutoresizeGuest)
                     resize_hint_timer->start (300, TRUE);
                 break;
@@ -2244 +2244 @@
 void VBoxConsoleView::toggleFSMode (const QSize &aSize)
 {
-    if ((mIsAdditionsActive && mAutoresizeGuest) ||
+    if ((mGuestSupportsGraphics && mAutoresizeGuest) ||
         mMainWnd->isTrueFullscreen())
     {
@@ -2286 +2286 @@
 bool VBoxConsoleView::isAutoresizeGuestActive()
 {
-    return mIsAdditionsActive && mAutoresizeGuest;
+    return mGuestSupportsGraphics && mAutoresizeGuest;
 }
 
@@ -3545 +3545 @@
 void VBoxConsoleView::doResizeHint (const QSize &aToSize)
 {
-    if ((mIsAdditionsActive && mAutoresizeGuest) ||
+    if ((mGuestSupportsGraphics && mAutoresizeGuest) ||
         mMainWnd->isTrueFullscreen())
     {
@@ -3654 +3654 @@
     if (mode == VBoxDefs::SDLMode)
     {
-        if (!mIsAdditionsActive || !mAutoresizeGuest)
+        if (!mGuestSupportsGraphics || !mAutoresizeGuest)
             setMinimumSize (sizeHint());
         else