Changeset 70603 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jan 16, 2018 5:56:07 PM (7 years ago)

Author:

vboxsync

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

120314

Message:

FE/Qt: bugref:8694: Selector UI: Use similar to macOS approach while restoring window geometry on Windows platform; that way window frame will be take into account to avoid restoring window with off-screen frame.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIMainWindow.cpp (modified) (2 diffs)
• selector/UISelectorWindow.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMainWindow.cpp

@@ -23 +23 @@
 # include "QIMainWindow.h"
 # include "VBoxGlobal.h"
+# include "UIDesktopWidgetWatchdog.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -34 +35 @@
 void QIMainWindow::restoreGeometry()
 {
-#ifdef VBOX_WS_MAC
-    /* Use the old approach for OSX: */
+#if defined(VBOX_WS_MAC) || defined(VBOX_WS_WIN)
+    /* Use the old approach for OSX/Win: */
     move(m_geometry.topLeft());
     resize(m_geometry.size());
-#else /* VBOX_WS_MAC */
-    /* Use the new approach for Windows/X11: */
+#else /* !VBOX_WS_MAC && !VBOX_WS_WIN */
+    /* Use the new approach for X11: */
     VBoxGlobal::setTopLevelGeometry(this, m_geometry);
-#endif /* !VBOX_WS_MAC */
+#endif /* !VBOX_WS_MAC && !VBOX_WS_WIN */
 
     /* Maximize (if necessary): */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -1271 +1271 @@
             if (isVisible() && (windowState() & (Qt::WindowMaximized | Qt::WindowMinimized | Qt::WindowFullScreen)) == 0)
             {
-#ifdef VBOX_WS_MAC
+#if defined(VBOX_WS_MAC) || defined(VBOX_WS_WIN)
                 QMoveEvent *pMoveEvent = static_cast<QMoveEvent*>(pEvent);
                 m_geometry.moveTo(pMoveEvent->pos());
-#else /* VBOX_WS_MAC */
+#else /* !VBOX_WS_MAC && !VBOX_WS_WIN */
                 m_geometry.moveTo(geometry().x(), geometry().y());
-#endif /* !VBOX_WS_MAC */
+#endif /* !VBOX_WS_MAC && !VBOX_WS_WIN */
             }
             break;