Ticket #15863: setGeometry.patch

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

@@ -21 +21 @@
 
 /* GUI includes: */
 # include "QIMainWindow.h"
+# include "VBoxGlobal.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
@@ -38 +39 @@
     resize(m_geometry.size());
 #else /* VBOX_WS_MAC */
     /* Use the new approach for Windows/X11: */
-    setGeometry(m_geometry);
+    VBoxGlobal::setTopLevelGeometry(this, m_geometry);
 #endif /* !VBOX_WS_MAC */
 
     /* Maximize (if necessary): */

src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -36 +36 @@
 # include <QDir>
 # include <QLocale>
 # include <QSpinBox>
+# include <QMainWindow>
 # ifdef VBOX_WS_WIN
 #  include <QEventLoop>
 # endif /* VBOX_WS_WIN */
@@ -49 +50 @@
 # endif /* VBOX_GUI_WITH_PIDFILE */
 # if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
 #  include <QScreen>
+#  include <xcb/xcb.h>
+#  include <xcb/xcb_icccm.h>
 # endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
 
 /* GUI includes: */
@@ -3702 +3705 @@
     pSpinBox->setMinimumWidth(iTextWidth + iSpinBoxDelta);
 }
 
+/* static */
+void VBoxGlobal::setTopLevelGeometry(QMainWindow *window, int x, int y, int w, int h)
+{
+#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+# define QWINDOWSIZE_MAX ((1<<24)-1)
+    if (window->isVisible())
+    {
+        /* X11 window managers are not required to accept geometry changes on
+         * the top-level window.  Unfortunately, current at Qt 5.6 and 5.7, Qt
+         * assumes that the change will succeed, and resizes all sub-windows
+         * unconditionally.  By calling ConfigureWindow directly, Qt will see
+         * our change request as an externally triggered one on success and not
+         * at all if it is rejected. */
+        uint16_t fMask =   XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y
+                         | XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT;
+        uint32_t values[] = { (uint32_t)x, (uint32_t)y, (uint32_t)w, (uint32_t)h };
+        xcb_configure_window(QX11Info::connection(), (xcb_window_t)window->winId(),
+                             fMask, values);
+        xcb_size_hints_t hints;
+        hints.flags = XCB_ICCCM_SIZE_HINT_US_POSITION | XCB_ICCCM_SIZE_HINT_US_SIZE;
+        hints.x          = x;
+        hints.y          = y;
+        hints.width      = w;
+        hints.height     = h;
+        hints.min_width  = window->minimumSize().width();
+        hints.min_height = window->minimumSize().height();
+        hints.max_width  = window->maximumSize().width();
+        hints.max_height = window->maximumSize().height();
+        if (hints.min_width > 0 && hints.min_height > 0)
+            hints.flags |= XCB_ICCCM_SIZE_HINT_P_MIN_SIZE;
+        if (hints.max_width < QWINDOWSIZE_MAX && hints.max_height < QWINDOWSIZE_MAX)
+            hints.flags |= XCB_ICCCM_SIZE_HINT_P_MAX_SIZE;
+        xcb_change_property(QX11Info::connection(), XCB_PROP_MODE_REPLACE,
+                            (xcb_window_t)window->winId(), XCB_ATOM_WM_NORMAL_HINTS,
+                            XCB_ATOM_WM_SIZE_HINTS, 32, sizeof(hints) >> 2, &hints);
+        xcb_flush(QX11Info::connection());
+    }
+    else
+        /* Call the Qt method if the window is not visible as otherwise no
+         * Configure event will arrive to tell Qt what geometry we want. */
+        window->setGeometry(x, y, w, h);
+# else
+    window->setGeometry(x, y, w, h);
+# endif
+}
+
+/* static */
+void VBoxGlobal::setTopLevelGeometry(QMainWindow *window, QRect rect)
+{
+    VBoxGlobal::setTopLevelGeometry(window, rect.x(), rect.y(), rect.width(), rect.height());
+}
+
 // Public slots
 ////////////////////////////////////////////////////////////////////////////////
 

src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -26 +26 @@
 #include <QHash>
 #include <QFileIconProvider>
 #include <QReadWriteLock>
+# include <QMainWindow>
 #ifdef VBOX_WS_MAC
 # include <QSet>
 #endif /* VBOX_WS_MAC */
@@ -442 +443 @@
      * to strict the minimum width to reflect at least [n] symbols. */
     static void setMinimumWidthAccordingSymbolCount(QSpinBox *pSpinBox, int cCount);
 
+    /** Set top-level window geometry, taking into account that this may fail
+     * on X11. */
+    static void setTopLevelGeometry(QMainWindow *window, int x, int y, int w, int h);
+    static void setTopLevelGeometry(QMainWindow *window, QRect rect);
+
 signals:
 
     /** Notifies listeners about the VBoxSVC availability change. */

src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

@@ -350 +350 @@
             geo = QRect(QPoint(0, 0), QSize(800, 600).boundedTo(workingArea.size()));
         /* Move window to the center of working-area: */
         geo.moveCenter(workingArea.center());
-        setGeometry(geo);
+        VBoxGlobal::setTopLevelGeometry(this, geo);
     }
 
 #elif defined(VBOX_WS_WIN)

src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -371 +371 @@
             {
                 /* Restore window geometry: */
                 m_normalGeometry = geo;
-                setGeometry(m_normalGeometry);
+                VBoxGlobal::setTopLevelGeometry(this, m_normalGeometry);
             }
             /* If previous machine-state was NOT SAVED: */
             else
@@ -378 +378 @@
             {
                 /* Restore only window position: */
                 m_normalGeometry = QRect(geo.x(), geo.y(), width(), height());
-                setGeometry(m_normalGeometry);
+                VBoxGlobal::setTopLevelGeometry(this, m_normalGeometry);
                 /* And normalize to the optimal-size: */
                 normalizeGeometry(false /* adjust position */);
             }
@@ -400 +400 @@
             /* Move newly created window to the screen-center: */
             m_normalGeometry = geometry();
             m_normalGeometry.moveCenter(availableGeo.center());
-            setGeometry(m_normalGeometry);
+            VBoxGlobal::setTopLevelGeometry(this, m_normalGeometry);
         }
 
         /* Normalize to the optimal size: */
@@ -574 +574 @@
         frGeo = VBoxGlobal::normalizeGeometry(frGeo, gpDesktop->overallAvailableRegion());
 
     /* Finally, set the frame geometry: */
-    setGeometry(frGeo.left() + dl, frGeo.top() + dt,
-                frGeo.width() - dl - dr, frGeo.height() - dt - db);
+    VBoxGlobal::setTopLevelGeometry(this, frGeo.left() + dl, frGeo.top() + dt,
+                                    frGeo.width() - dl - dr, frGeo.height() - dt - db);
 #else /* VBOX_GUI_WITH_CUSTOMIZATIONS1 */
     /* Customer request: There should no be
      * machine-window resize/move on machine-view resize: */

src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp

@@ -101 +101 @@
         {
             /* Restore window geometry: */
             m_normalGeometry = geo;
-            setGeometry(m_normalGeometry);
+            VBoxGlobal::setTopLevelGeometry(this, m_normalGeometry);
 
             /* Maximize (if necessary): */
             if (gEDataManager->machineWindowShouldBeMaximized(machineLogic()->visualStateType(),
@@ -120 +120 @@
             /* Move newly created window to the screen-center: */
             m_normalGeometry = geometry();
             m_normalGeometry.moveCenter(availableGeo.center());
-            setGeometry(m_normalGeometry);
+            VBoxGlobal::setTopLevelGeometry(this, m_normalGeometry);
         }
 
         /* Normalize to the optimal size: */
@@ -201 +201 @@
         frGeo = VBoxGlobal::normalizeGeometry(frGeo, gpDesktop->overallAvailableRegion());
 
     /* Finally, set the frame geometry: */
-    setGeometry(frGeo.left() + dl, frGeo.top() + dt,
-                frGeo.width() - dl - dr, frGeo.height() - dt - db);
+    VBoxGlobal::setTopLevelGeometry(this, frGeo.left() + dl, frGeo.top() + dt,
+                                    frGeo.width() - dl - dr, frGeo.height() - dt - db);
 #else /* VBOX_GUI_WITH_CUSTOMIZATIONS1 */
     /* Customer request: There should no be
      * machine-window resize/move on machine-view resize: */