Changeset 8717 in vbox

Timestamp:

May 8, 2008 3:42:24 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: Backported:

• r30555 (2838: "Don't leave fullscreen when changing the guest resolution" fix. )
• r30585 (2800 "FE/Qt: Switch to fullscreen does not work reliably" : Avoid waiting for 2 seconds then switching f/s mode in case of GA disabled.)
• r30605 (2800: FE/Qt: Switch to fullscreen does not work reliably: comment #25 fix.)

Location:

trunk/src/VBox/Frontends/VirtualBox4/src

Files:

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

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

@@ -676 +676 @@
     ::memset (mPressedKeys, 0, SIZEOF_ARRAY (mPressedKeys));
 
+    /* This timer is used as 'last resort' which toggles f/s mode
+       in case of guest additions are not responding. */
     mToggleFSModeTimer = new QTimer (this);
     mToggleFSModeTimer->setSingleShot (true);
@@ -2233 +2235 @@
 void VBoxConsoleView::toggleFSMode()
 {
-    if (mIsAdditionsActive && mAutoresizeGuest)
+    if ((mIsAdditionsActive && mAutoresizeGuest) ||
+        mMainWnd->isTrueFullscreen())
     {
         QSize newSize = QSize();
@@ -2245 +2248 @@
         doResizeHint (newSize);
     }
-    mToggleFSModeTimer->start (2000);
+    /* 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
+     * before normalizing geometry. */
+    mToggleFSModeTimer->start (mIsAdditionsActive && mAutoresizeGuest ?
+        2000 : 100);
+
+    /// @todo (r=dsen) perform roll-back after 'entering' mode in case
+    //                 we got no resizing response from the guest.
 }
 
@@ -3492 +3505 @@
 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
@@ -3506 +3520 @@
         setDesktopGeometry(sz.width(), sz.height());
 
-        mConsole.GetDisplay().SetVideoModeHint (sz.width(), sz.height(), 0, 0);
+        if (mIsAdditionsActive && mAutoresizeGuest)
+            mConsole.GetDisplay().SetVideoModeHint (sz.width(), sz.height(), 0, 0);
     }
 }

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

@@ -1038 +1038 @@
      * 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)
@@ -1052 +1052 @@
     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()));
 }
 
@@ -1087 +1088 @@
 void VBoxConsoleWnd::exitFullscreen()
 {
+    Assert (0); /* disabled for now */
     if (mIsFullscreen && vmFullscreenAction->isEnabled())
         vmFullscreenAction->toggle();