Changeset 8628 in vbox for trunk/src/VBox

Timestamp:

May 6, 2008 2:35:21 PM (17 years ago)

Author:

vboxsync

Message:

2838: "Don't leave fullscreen when changing the guest resolution" fix.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxConsoleView.cpp (modified) (4 diffs)
• VBoxConsoleWnd.cpp (modified) (3 diffs)

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

@@ -157 +157 @@
 
     /* For debugging events */
-    /* 
+    /*
     if (!(eventKind == kEventWindowActivated ||
           eventClass == 0x63757465))
@@ -2238 +2238 @@
 void VBoxConsoleView::toggleFSMode()
 {
-    if (mIsAdditionsActive && mAutoresizeGuest)
+    if ((mIsAdditionsActive && mAutoresizeGuest) ||
+        mMainWnd->isTrueFullscreen())
     {
         QSize newSize = QSize();
@@ -3505 +3506 @@
 void VBoxConsoleView::doResizeHint (const QSize &aToSize)
 {
-    if (mIsAdditionsActive && mAutoresizeGuest)
+    if ((mIsAdditionsActive && mAutoresizeGuest) ||
+        mMainWnd->isTrueFullscreen())
     {
         /* If this slot is invoked directly then use the passed size
@@ -3519 +3521 @@
         setDesktopGeometry(sz.width(), sz.height());
 
-        mConsole.GetDisplay().SetVideoModeHint (sz.width(), sz.height(), 0, 0);
+        if (mIsAdditionsActive)
+            mConsole.GetDisplay().SetVideoModeHint (sz.width(), sz.height(), 0, 0);
     }
 }

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

@@ -1028 +1028 @@
      * we requested. So after all the resizing stuff set the clipping
      * mask and the spacing shifter to the corresponding values. */
-    setViewInSeamlessMode (QRect(console->mapToGlobal (QPoint(0, 0)), console->size()));
+    setViewInSeamlessMode (QRect (console->mapToGlobal (QPoint (0, 0)), console->size()));
 #ifdef Q_WS_MAC
     if (!mIsSeamless)
@@ -1042 +1042 @@
     if (mIsSeamless)
         connect (console, SIGNAL (resizeHintDone()),
-                 this, SLOT(exitSeamless()));
-    else if (mIsFullscreen)
-        connect (console, SIGNAL (resizeHintDone()),
-                 this, SLOT(exitFullscreen()));
+                 this, SLOT (exitSeamless()));
+    /* disabled for now */
+    //else if (mIsFullscreen)
+    //    connect (console, SIGNAL (resizeHintDone()),
+    //             this, SLOT (exitFullscreen()));
 }
 
@@ -1077 +1078 @@
 void VBoxConsoleWnd::exitFullscreen()
 {
+    Assert (0); /* disabled for now */
     if (mIsFullscreen && vmFullscreenAction->isEnabled())
         vmFullscreenAction->toggle();