Changeset 5814 in vbox

Timestamp:

Nov 22, 2007 1:40:12 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

26242

Message:

Fixing some issues in fullscreen/seamless modes switch:

1. Restoring fullscreen vm -> exit fullscreen -> borderless window.
2. Restoring seamless vm -> stricted area (host taskbar) is not repainted.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -1048 +1048 @@
                 /* emit a signal about guest was resized */
                 emit resizeHintDone();
+
+                /* update geometry after entering fullscreen | seamless */
+                if (mainwnd->isTrueFullscreen() || mainwnd->isTrueSeamless())
+                    updateGeometry();
 
                 return true;

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

@@ -655 +655 @@
     CMachine cmachine = csession.GetMachine();
 
+    show();
+
     /* restore the position of the window and some options */
     {
@@ -813 +815 @@
     updateAppearanceOf (AllStuff);
 
-    show();
-
     if (vboxGlobal().settings().autoCapture())
         vboxProblem().remindAboutAutoCapture();
@@ -1009 +1009 @@
     vmSeamlessAction->setEnabled (mIsSeamless);
     vmFullscreenAction->setEnabled (mIsFullscreen);
-
-    console->updateGeometry();
 }
 
@@ -1078 +1076 @@
             QResizeEvent *re = (QResizeEvent *) e;
 
-            if ((windowState() & WindowMaximized) == 0)
+            if (!isMaximized() && !isTrueFullscreen() && !isTrueSeamless())
             {
                 normal_size = re->size();
@@ -1089 +1087 @@
         case QEvent::Move:
         {
-            if ((windowState() & (WindowMaximized | WindowMinimized |
-                                  WindowFullScreen)) == 0)
+            if (!isMaximized() && !isTrueFullscreen() && !isTrueSeamless())
             {
                 normal_pos = pos();
@@ -1902 +1899 @@
 }
 
-/** 
+/**
  * @return @c true if successfully performed the requested operation and false
  * otherwise.
@@ -1910 +1907 @@
     if (aSeamless)
     {
-        /* Check if it is necessary to enter/leave seamless mode. We assert
-         * here because the corresponding actions must be properly disabled by
-         * the below code to give the user an adequate feedback and prevent
-         * from calling this method. */
-        AssertReturn (aOn && mIsSeamlessSupported && !mIsFullscreen ||
-                      !aOn && mIsSeamless,
-                      false);
-
         /* Check if the Guest Video RAM enough for the seamless mode. */
         QRect screen = QApplication::desktop()->screenGeometry (this);
@@ -2025 +2014 @@
 
 #ifdef Q_WS_WIN32
-        mPrevRegion = scrGeo;
+        mPrevRegion = dtw->screenGeometry (this);
 #endif
 
@@ -2055 +2044 @@
         /* Going fullscreen */
         setWindowState (windowState() ^ WindowFullScreen);
+        setMask (dtw->screenGeometry (this));
 
 #ifdef Q_WS_MAC
@@ -2140 +2130 @@
 void VBoxConsoleWnd::vmSeamless (bool aOn)
 {
-    bool ok = toggleFullscreenMode (aOn, true /* aSeamless */);
-    if (!ok)
-    {
-        /* on failure, restore the previous button state */
-        vmSeamlessAction->blockSignals (true);
-        vmSeamlessAction->setOn (!aOn);
-        vmSeamlessAction->blockSignals (false);
+    /* check if it is possible to enter/leave seamless mode */
+    if (aOn && mIsSeamlessSupported && !mIsFullscreen ||
+        !aOn && mIsSeamless)
+    {
+        bool ok = toggleFullscreenMode (aOn, true /* aSeamless */);
+        if (!ok)
+        {
+            /* on failure, restore the previous button state */
+            vmSeamlessAction->blockSignals (true);
+            vmSeamlessAction->setOn (!aOn);
+            vmSeamlessAction->blockSignals (false);
+        }
     }
 }