Changeset 64334 in vbox for trunk

Timestamp:

Oct 20, 2016 2:43:06 PM (8 years ago)

Author:

vboxsync

Message:

bugref:8631: FE/Qt: resizing problems with tiled window managers: when the Qt method setGeometry() resizes a window it assumes that the operation will succeed, notably resizing all sub-windows too. With top-level windows on X11 the window manager may decide to override the size requested, and tiled window managers often do. To handle this, we do the resize using X11 functionality without telling Qt and let Qt find out from the resize event like for user-triggered resizes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxSnapshotDetailsDlg.cpp (modified) (1 diff)
• extensions/QIMainWindow.cpp (modified) (2 diffs)
• globals/VBoxGlobal.cpp (modified) (2 diffs)
• globals/VBoxGlobal.h (modified) (1 diff)
• runtime/UISlidingToolBar.cpp (modified) (3 diffs)
• runtime/fullscreen/UIMachineWindowFullscreen.cpp (modified) (1 diff)
• runtime/normal/UIMachineWindowNormal.cpp (modified) (4 diffs)
• runtime/scale/UIMachineWindowScale.cpp (modified) (3 diffs)
• widgets/UIPopupStack.cpp (modified) (2 diffs)

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

@@ -194 +194 @@
     QRect geo (QPoint (0, 0), initSize);
     geo.moveCenter (parentWidget()->geometry().center());
-    setGeometry (geo);
+    VBoxGlobal::setTopLevelGeometry(this, geo);
 
     retranslateUi();

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

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

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

@@ -50 +50 @@
 # 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 */
 
@@ -3703 +3705 @@
 }
 
+/* static */
+void VBoxGlobal::setTopLevelGeometry(QWidget *pWidget, int x, int y, int w, int h)
+{
+#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+# define QWINDOWSIZE_MAX ((1<<24)-1)
+    if (pWidget->isWindow() && pWidget->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)pWidget->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  = pWidget->minimumSize().width();
+        hints.min_height = pWidget->minimumSize().height();
+        hints.max_width  = pWidget->maximumSize().width();
+        hints.max_height = pWidget->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)pWidget->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. */
+        pWidget->setGeometry(x, y, w, h);
+# else
+    pWidget->setGeometry(x, y, w, h);
+# endif
+}
+
+/* static */
+void VBoxGlobal::setTopLevelGeometry(QWidget *pWidget, const QRect &rect)
+{
+    VBoxGlobal::setTopLevelGeometry(pWidget, rect.x(), rect.y(), rect.width(), rect.height());
+}
+
 // Public slots
 ////////////////////////////////////////////////////////////////////////////////

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

@@ -442 +442 @@
      * to strict the minimum width to reflect at least [n] symbols. */
     static void setMinimumWidthAccordingSymbolCount(QSpinBox *pSpinBox, int cCount);
+
+    /** Assigns top-level @a pWidget geometry passed as QRect coordinates.
+      * @note  Take into account that this request may fail on X11. */
+    static void setTopLevelGeometry(QWidget *pWidget, int x, int y, int w, int h);
+    /** Assigns top-level @a pWidget geometry passed as @a rect.
+      * @note  Take into account that this request may fail on X11. */
+    static void setTopLevelGeometry(QWidget *pWidget, const QRect &rect);
 
 signals:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISlidingToolBar.cpp

@@ -140 +140 @@
         case Position_Top:
         {
-            setGeometry(m_parentRect.x(), m_parentRect.y()                         + m_indentRect.height(),
-                        qMax(m_parentRect.width(), sh.width()), sh.height());
+            VBoxGlobal::setTopLevelGeometry(this, m_parentRect.x(), m_parentRect.y()                         + m_indentRect.height(),
+                                                  qMax(m_parentRect.width(), sh.width()), sh.height());
             m_pEmbeddedWidget->setGeometry(0, -sh.height(), qMax(width(), sh.width()), sh.height());
             break;
@@ -147 +147 @@
         case Position_Bottom:
         {
-            setGeometry(m_parentRect.x(), m_parentRect.y() + m_parentRect.height() - m_indentRect.height() - sh.height(),
-                        qMax(m_parentRect.width(), sh.width()), sh.height());
+            VBoxGlobal::setTopLevelGeometry(this, m_parentRect.x(), m_parentRect.y() + m_parentRect.height() - m_indentRect.height() - sh.height(),
+                                                  qMax(m_parentRect.width(), sh.width()), sh.height());
             m_pEmbeddedWidget->setGeometry(0,  sh.height(), qMax(width(), sh.width()), sh.height());
             break;
@@ -197 +197 @@
         case Position_Top:
         {
-            setGeometry(m_parentRect.x(), m_parentRect.y()                         + m_indentRect.height(),
-                        qMax(m_parentRect.width(), sh.width()), sh.height());
+            VBoxGlobal::setTopLevelGeometry(this, m_parentRect.x(), m_parentRect.y()                         + m_indentRect.height(),
+                                                  qMax(m_parentRect.width(), sh.width()), sh.height());
             break;
         }
         case Position_Bottom:
         {
-            setGeometry(m_parentRect.x(), m_parentRect.y() + m_parentRect.height() - m_indentRect.height() - sh.height(),
-                        qMax(m_parentRect.width(), sh.width()), sh.height());
+            VBoxGlobal::setTopLevelGeometry(this, m_parentRect.x(), m_parentRect.y() + m_parentRect.height() - m_indentRect.height() - sh.height(),
+                                                  qMax(m_parentRect.width(), sh.width()), sh.height());
             break;
         }

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

@@ -351 +351 @@
         /* Move window to the center of working-area: */
         geo.moveCenter(workingArea.center());
-        setGeometry(geo);
+        VBoxGlobal::setTopLevelGeometry(this, geo);
     }
 

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

@@ -372 +372 @@
                 /* Restore window geometry: */
                 m_normalGeometry = geo;
-                setGeometry(m_normalGeometry);
+                VBoxGlobal::setTopLevelGeometry(this, m_normalGeometry);
             }
             /* If previous machine-state was NOT SAVED: */
@@ -379 +379 @@
                 /* 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 */);
@@ -401 +401 @@
             m_normalGeometry = geometry();
             m_normalGeometry.moveCenter(availableGeo.center());
-            setGeometry(m_normalGeometry);
+            VBoxGlobal::setTopLevelGeometry(this, m_normalGeometry);
         }
 
@@ -575 +575 @@
 
     /* 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

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

@@ -102 +102 @@
             /* Restore window geometry: */
             m_normalGeometry = geo;
-            setGeometry(m_normalGeometry);
+            VBoxGlobal::setTopLevelGeometry(this, m_normalGeometry);
 
             /* Maximize (if necessary): */
@@ -121 +121 @@
             m_normalGeometry = geometry();
             m_normalGeometry.moveCenter(availableGeo.center());
-            setGeometry(m_normalGeometry);
+            VBoxGlobal::setTopLevelGeometry(this, m_normalGeometry);
         }
 
@@ -202 +202 @@
 
     /* 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

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupStack.cpp

@@ -28 +28 @@
 
 /* GUI includes: */
+# include "VBoxGlobal.h"
 # include "UIPopupStack.h"
 # include "UIPopupStackViewport.h"
@@ -167 +168 @@
 
     /* Adjust geometry: */
-    setGeometry(iX, iY, iWidth, iHeight);
+    VBoxGlobal::setTopLevelGeometry(this, iX, iY, iWidth, iHeight);
 }