FE/Qt: github:gh-197 and github:gh-243: Runtime UI / Windows host: A try to fix full-screen support for multi-monitor case.

Dsen-orcl · Dsen-orcl · commit 793b64c55973 · 2025-10-23T14:08:21.000Z
svn:sync-xref-src-repo-rev: r171043
diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp
@@ -1,4 +1,4 @@
-/* $Id: UIMachineWindowFullscreen.cpp 110684 2025-08-11 17:18:47Z klaus.espenlaub@oracle.com $ */
+/* $Id: UIMachineWindowFullscreen.cpp 111483 2025-10-23 14:08:21Z sergey.dubov@oracle.com $ */
 /** @file
  * VBox Qt GUI - UIMachineWindowFullscreen class implementation.
  */
@@ -379,8 +379,9 @@ void UIMachineWindowFullscreen::placeOnScreen()
 
     /* Map window onto required screen: */
     windowHandle()->setScreen(qApp->screens().at(iHostScreen));
-    /* Set appropriate window size: */
+    /* Set appropriate window position&size: */
     resize(workingArea.size());
+    move(workingArea.topLeft());
 
 #elif defined(VBOX_WS_NIX)
 
@@ -458,11 +459,17 @@ void UIMachineWindowFullscreen::showInNecessaryMode()
         if (fWasMinimized)
             setWindowState(Qt::WindowNoState);
 
+        /* Exit full-screen if necessary: */
+        if (isFullScreen())
+            showNormal();
+
         /* Make sure window have appropriate geometry: */
         placeOnScreen();
 
-        /* Show window: */
-        showFullScreen();
+        /* First of all show window in normal mode
+         * then request full-screen mode async way: */
+        showNormal();
+        QTimer::singleShot(0, this, SLOT(showFullScreen()));
 
         /* Restore minimized state if necessary: */
         if (m_fWasMinimized || fWasMinimized)
diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp
@@ -1,4 +1,4 @@
-/* $Id: UIMiniToolBar.cpp 110684 2025-08-11 17:18:47Z klaus.espenlaub@oracle.com $ */
+/* $Id: UIMiniToolBar.cpp 111483 2025-10-23 14:08:21Z sergey.dubov@oracle.com $ */
 /** @file
  * VBox Qt GUI - UIMiniToolBar class implementation.
  */
@@ -862,8 +862,10 @@ void UIMiniToolBar::sltShow()
         }
         case GeometryType_Full:
         {
-            /* Show full-screen: */
-            showFullScreen();
+            /* First of all show window in normal mode
+             * then request full-screen mode async way: */
+            showNormal();
+            QTimer::singleShot(0, this, SLOT(showFullScreen()));
             break;
         }
     }
@@ -963,17 +965,19 @@ void UIMiniToolBar::sltAdjust()
         }
         case GeometryType_Full:
         {
-            /* Map window onto required screen: */
-            LogRel(("GUI:  Map mini-toolbar for window #%d to screen %d of %d\n",
-                     m_iWindowIndex, iHostScreen, qApp->screens().size()));
-            windowHandle()->setScreen(qApp->screens().at(iHostScreen));
-
             /* Set appropriate window size: */
             const QSize newSize = workingArea.size();
             LogRel(("GUI:  Resize mini-toolbar for window #%d to %dx%d\n",
                      m_iWindowIndex, newSize.width(), newSize.height()));
             resize(newSize);
 
+            /* Map/move window onto required screen: */
+            const QPoint newPosition = workingArea.topLeft();
+            LogRel(("GUI:  Map&move mini-toolbar for window #%d to screen %d of %d\n",
+                     m_iWindowIndex, iHostScreen, qApp->screens().size()));
+            windowHandle()->setScreen(qApp->screens().at(iHostScreen));
+            move(newPosition);
+
             break;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $Id: UIMiniToolBar.cpp 110684 2025-08-11 17:18:47Z klaus.espenlaub@oracle.com $ */`
	`1`	`+/* $Id: UIMiniToolBar.cpp 111483 2025-10-23 14:08:21Z sergey.dubov@oracle.com $ */`
`2`	`2`	`/** @file`
`3`	`3`	`* VBox Qt GUI - UIMiniToolBar class implementation.`
`4`	`4`	`*/`
`@@ -862,8 +862,10 @@ void UIMiniToolBar::sltShow()`
`862`	`862`	`}`
`863`	`863`	`case GeometryType_Full:`
`864`	`864`	`{`
`865`		`- /* Show full-screen: */`
`866`		`- showFullScreen();`
	`865`	`+ /* First of all show window in normal mode`
	`866`	`+ * then request full-screen mode async way: */`
	`867`	`+ showNormal();`
	`868`	`+ QTimer::singleShot(0, this, SLOT(showFullScreen()));`
`867`	`869`	`break;`
`868`	`870`	`}`
`869`	`871`	`}`
`@@ -963,17 +965,19 @@ void UIMiniToolBar::sltAdjust()`
`963`	`965`	`}`
`964`	`966`	`case GeometryType_Full:`
`965`	`967`	`{`
`966`		`- /* Map window onto required screen: */`
`967`		`- LogRel(("GUI: Map mini-toolbar for window #%d to screen %d of %d\n",`
`968`		`- m_iWindowIndex, iHostScreen, qApp->screens().size()));`
`969`		`- windowHandle()->setScreen(qApp->screens().at(iHostScreen));`
`970`		`-`
`971`	`968`	`/* Set appropriate window size: */`
`972`	`969`	`const QSize newSize = workingArea.size();`
`973`	`970`	`LogRel(("GUI: Resize mini-toolbar for window #%d to %dx%d\n",`
`974`	`971`	`m_iWindowIndex, newSize.width(), newSize.height()));`
`975`	`972`	`resize(newSize);`
`976`	`973`
	`974`	`+ /* Map/move window onto required screen: */`
	`975`	`+ const QPoint newPosition = workingArea.topLeft();`
	`976`	`+ LogRel(("GUI: Map&move mini-toolbar for window #%d to screen %d of %d\n",`
	`977`	`+ m_iWindowIndex, iHostScreen, qApp->screens().size()));`
	`978`	`+ windowHandle()->setScreen(qApp->screens().at(iHostScreen));`
	`979`	`+ move(newPosition);`
	`980`	`+`
`977`	`981`	`break;`
`978`	`982`	`}`
`979`	`983`	`}`