Changeset 64398 in vbox

Timestamp:

Oct 24, 2016 3:26:55 PM (8 years ago)

Author:

vboxsync

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

111508

Message:

bugref:8631: FE/Qt: resizing problems with tiling window managers: set additional hints and small clean-ups.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (modified) (4 diffs)

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

@@ -3704 +3704 @@
 }
 
+#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
 typedef struct {
 /** User specified flags */
@@ -3726 +3727 @@
 uint32_t win_gravity;
 } xcb_size_hints_t;
+#endif /* defined(VBOX_WS_X11) && QT_VERSION >= 0x050000 */
 
 /* static */
 void VBoxGlobal::setTopLevelGeometry(QWidget *pWidget, int x, int y, int w, int h)
 {
+    AssertPtrReturnVoid(pWidget);
 #if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
 # define QWINDOWSIZE_MAX ((1<<24)-1)
@@ -3748 +3751 @@
         hints.flags =   1 /* XCB_ICCCM_SIZE_HINT_US_POSITION */
                       | 2 /* 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();
+        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();
+        hints.width_inc   = pWidget->sizeIncrement().width();
+        hints.height_inc  = pWidget->sizeIncrement().height();
+        hints.base_width  = pWidget->baseSize().width();
+        hints.base_height = pWidget->baseSize().height();
         if (hints.min_width > 0 || hints.min_height > 0)
             hints.flags |= 16 /* XCB_ICCCM_SIZE_HINT_P_MIN_SIZE */;
         if (hints.max_width < QWINDOWSIZE_MAX || hints.max_height < QWINDOWSIZE_MAX)
             hints.flags |= 32 /* XCB_ICCCM_SIZE_HINT_P_MAX_SIZE */;
+        if (hints.width_inc > 0 || hints.height_inc)
+            hints.flags |=   64 /* XCB_ICCCM_SIZE_HINT_P_MIN_SIZE */
+                           | 256 /* XCB_ICCCM_SIZE_HINT_BASE_SIZE */;
         xcb_change_property(QX11Info::connection(), XCB_PROP_MODE_REPLACE,
                             (xcb_window_t)pWidget->winId(), XCB_ATOM_WM_NORMAL_HINTS,
@@ -3769 +3779 @@
          * Configure event will arrive to tell Qt what geometry we want. */
         pWidget->setGeometry(x, y, w, h);
-# else
+# else /* !defined(VBOX_WS_X11) && QT_VERSION >= 0x050000 */
     pWidget->setGeometry(x, y, w, h);
-# endif
+# endif /* !defined(VBOX_WS_X11) && QT_VERSION >= 0x050000 */
 }