Changeset 5643 in vbox

Timestamp:

Nov 8, 2007 3:40:18 PM (17 years ago)

Author:

vboxsync

Message:

Fixing some issues in fullscreen/seamless mode switch for KDE and Win.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxConsoleView.cpp (modified) (1 diff)
• VBoxConsoleWnd.cpp (modified) (5 diffs)

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

@@ -846 +846 @@
     /* Make no normalizeGeometry in case we are in manual resize
      * mode or main window is maximized */
-    if (mainwnd->isMaximized())
+    if (mainwnd->isMaximized() || mainwnd->isFullScreen())
         return;
 

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

@@ -1009 +1009 @@
     vmSeamlessAction->setEnabled (mIsSeamless);
     vmFullscreenAction->setEnabled (mIsFullscreen);
+
+    console->updateGeometry();
 }
 
@@ -1990 +1992 @@
 
         /* Memorize the maximized state. */
-        was_max = isMaximized();
+        QDesktopWidget *dtw = QApplication::desktop();
+        was_max = isMaximized() &&
+                  dtw->availableGeometry().width()  == frameSize().width() &&
+                  dtw->availableGeometry().height() == frameSize().height();
 
         /* Save the previous scroll-view minimum size before entering
@@ -2001 +2006 @@
         /* let the widget take the whole available desktop space */
         QRect scrGeo = aSeamless ?
-            QApplication::desktop()->availableGeometry (this) :
-            QApplication::desktop()->screenGeometry (this);
+            dtw->availableGeometry (this) : dtw->screenGeometry (this);
 
         /* Calculate the difference region between current mode
          * (fullscreen or seamless) and the screen geometry. */
         mStrictedRegion =
-            QRegion (QApplication::desktop()->screenGeometry (this)) - scrGeo;
+            QRegion (dtw->screenGeometry (this)) - scrGeo;
 
         /* Setup the shifting spacer to make the console to be aligned on top
@@ -2043 +2047 @@
         console->setHScrollBarMode (QScrollView::AlwaysOff);
 
-        /* Going fullscreen:
-         * "normal -> fullscreen" for normal window,
-         * "maximized -> normal -> fullscreen" for maximized window.
-         * Going "maximized -> fullscreen" wrong on KDE in both directions.
-         * Here it does not resize the child window correctly. */
-        if (was_max)
-            showNormal();
-        showFullScreen();
+        /* Going fullscreen */
+        setWindowState (windowState() ^ WindowFullScreen);
 
 #ifdef Q_WS_MAC
@@ -2105 +2103 @@
         hidden_children.clear();
 
-        /* Going normal || maximized:
-         * "fullscreen -> normal" if was normal window,
-         * "fullscreen -> normal -> maximized" if was maximized window.
-         * Going "fullscreen -> maximized" wrong on KDE in both directions.
-         * Here it looses the window frame totally. */
-        showNormal();
-        if (was_max)
-            showMaximized();
+        /* Going normal || maximized */
+        setWindowState (windowState() ^ WindowFullScreen);
 
         qApp->processEvents();