Changeset 289

Timestamp:

Nov 5, 2009, 8:49:08 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed two sizing-related bugs:

• Fixed size top-level widgets could not be moved due to maximum size (as reported to PM) being smaller than the minimum size;
• An attempt to unexpectedly change the internal widget size data in WM_SIZE in response to Qt initiated resize could cause an application crash in some styles (e.g. Windows classic style). This slipped in from Qt3 but is apparently not necessary in Qt4.

Location:

trunk/src/gui/kernel

Files:

• qapplication_pm.cpp (modified) (3 diffs)
• qwidget_pm.cpp (modified) (1 diff)

trunk/src/gui/kernel/qapplication_pm.cpp ¶

@@ -120 +120 @@
     QWExtra    *xtra() { return d_func()->extraData(); }
     QTLWExtra  *topData() { return d_func()->topData(); }
+    QTLWExtra  *maybeTopData() { return d_func()->maybeTopData(); }
 // @todo later
-//  QTLWExtra  *maybeTopData() { return d_func()->maybeTopData(); }
 //  void syncBackingStore(const QRegion &rgn) { d_func()->syncBackingStore(rgn); }
 //  void syncBackingStore() { d_func()->syncBackingStore(); }
@@ -1129 +1129 @@
                     minh = x->minh + fs.top() + fs.bottom();
                 if (x->maxw < QWIDGETSIZE_MAX)
-                    maxw = x->maxw >= x->minw ? x->maxw : x->minw + fs.left() + fs.right();
+                    maxw = x->maxw > x->minw ? x->maxw + fs.left() + fs.right() : minw;
                 if (x->maxh < QWIDGETSIZE_MAX)
-                    maxh = x->maxh >= x->minh ? x->maxh : x->minh + fs.top() + fs.bottom();
+                    maxh = x->maxh > x->minh ? x->maxh + fs.top() + fs.bottom() : minh;
                 // obey system recommended minimum size (to emulate Qt/Win32)
                 pti->ptlMinTrackSize.x = qMax<LONG>(minw, pti->ptlMinTrackSize.x);
@@ -2042 +2042 @@
     if (!testAttribute(Qt::WA_WState_Created)) // in QWidget::create()
         return true;
-
-    if (testAttribute(Qt::WA_WState_ConfigPending)) {
-        // it's possible that we're trying to set the frame size smaller
-        // than it possible for WC_FRAME in QWidget::setGeometry_sys().
-        // here we correct this (crect there is set before WinSetWindowPos()
-        // that sends WM_SIZE).
-        QSize newSize(SHORT1FROMMP(qmsg.mp2), SHORT2FROMMP(qmsg.mp2));
-        if (qmsg.msg == WM_SIZE && size() != newSize)
-            data->crect.setSize(newSize);
+    if (testAttribute(Qt::WA_WState_ConfigPending))
         return true;
-    }
-
     if (testAttribute(Qt::WA_DontShowOnScreen))
         return true;
-    // @todo check if this is actually called for !isWindow() widget
-//  if (!isWindow())
-//      return true;
+
+    // @todo there are other isWindow() checks below (same in Windows code).
+    // Either they or this return statement are leftovers. The assertion may
+    // tell the truth.
+    Q_ASSERT(isWindow());
+    if (!isWindow())
+        return true;
 
     // When the window is minimized, PM moves it to -32000,-32000 and resizes

trunk/src/gui/kernel/qwidget_pm.cpp ¶

@@ -2404 +2404 @@
 void QWidgetPrivate::setModal_sys()
 {
-    // @todo implement
 }