Changeset 1019 for trunk/src/gui/kernel/qwidget_pm.cpp

Timestamp:

Aug 22, 2011, 4:35:22 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: Fix position errors on resize of child widgets.

During complex geometry change operations (e.g. directly resizing
the child widget managed by the layout manager of its parent and
then resizing the parent) the Y position of the child within the parent
could be shifted by the double delta of the resize value because
the new parent's height (in Qt terms) was used for flipping the Y
coordinate instead of the real height of the PM window which didn't
yet reflect the height change in Qt.

File:

• trunk/src/gui/kernel/qwidget_pm.cpp (modified) (5 diffs)

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -513 +513 @@
 #if defined(QT_DEBUGWIDGETMASK)
     qDebug() << "qt_WinSetWindowPos: hwnd" << qDebugHWND(hwnd)
+             << "behind" << qDebugFmtHex(hwndInsertBehind)
+             << x << y << cx << cy
              << "fl" << qDebugFmtHex(fl);
 #endif
@@ -530 +532 @@
     SWP swpOld;
     WinQueryWindowPos(hwnd, &swpOld);
+
+#if defined(QT_DEBUGWIDGETMASK)
+    qDebug() << "  old pos" << swpOld;
+    if (QWidget *w = qt_widget_from_hwnd(hwnd)) {
+        qDebug() << "  old geo" << w->geometry();
+        if (w->parentWidget()) {
+            qDebug() << "  parent" << w->parentWidget();
+            if (w->parentWidget()->internalWinId()) {
+                SWP swp;
+                WinQueryWindowPos(w->parentWidget()->internalWinId(), &swp);
+                qDebug() << "    pos" << swp;
+            }
+            qDebug() << "    geo" << w->parentWidget()->geometry();
+        }
+    }
+#endif
 
     // do some checks
@@ -1554 +1572 @@
             qDebug() << "|Destroying window (reparent)" << q
                      << "\n|  hwnd"  << qDebugFmtHex(old_fid);
-            if (old_fid != data.winid)
-                qDebug() << "|  hwnd" << qDebugFmtHex(data.winid) << "(client)";
 #endif
         qt_WinDestroyWindow(old_fid);
@@ -2071 +2087 @@
                 if (q->internalWinId() != NULLHANDLE) {
                     Q_ASSERT(parent->internalWinId() != NULLHANDLE);
-                    int h = parent->height();
+                    // important: use real parent height (it may not match crect yet)
+                    RECTL rcl;
+                    WinQueryWindowRect(parent->internalWinId(), &rcl);
                     qt_WinSetWindowPos(q->internalWinId(), 0, xrect.x(),
                                        // flip y coordinate
-                                       h - (xrect.y() + xrect.height()),
+                                       rcl.yTop - (xrect.y() + xrect.height()),
                                        xrect.width(), xrect.height(),
                                        SWP_MOVE | SWP_SIZE);
@@ -2128 +2146 @@
     // than moving mapped windows
     if (q->internalWinId() != NULLHANDLE) {
-        int h = parent->height();
-        if (parent->internalWinId() == NULLHANDLE) {
-            xrect.translate(parent->mapTo(q->nativeParentWidget(), QPoint(0, 0)));
-            h = q->nativeParentWidget()->height();
-        }
+        Q_ASSERT(parent->effectiveWinId());
+        // important: use real parent height (it may not match crect yet)
+        RECTL rcl;
+        WinQueryWindowRect(parent->effectiveWinId(), &rcl);
         qt_WinSetWindowPos(q->internalWinId(), 0, xrect.x(),
                            // flip y coordinate
-                           h - (xrect.y() + xrect.height()),
+                           rcl.yTop - (xrect.y() + xrect.height()),
                            xrect.width(), xrect.height(), SWP_MOVE | SWP_SIZE);
     }