Changeset 122 for trunk/src/gui

Timestamp:

Aug 20, 2009, 12:19:08 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Don't change top level window size/position in Qt when it gets minimized (makes it similar to other platforms like Windows).

Location:

trunk/src/gui/kernel

Files:

• qapplication_pm.cpp (modified) (2 diffs)
• qwidget_pm.cpp (modified) (2 diffs)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -1626 +1626 @@
 //      return true;
 
+
+
+
+
+
     setAttribute(Qt::WA_WState_ConfigPending); // set config flag
 
@@ -1637 +1642 @@
     if (qmsg.msg == WM_SIZE) { // resize event
         QSize oldSize = data->crect.size();
-        QSize newSize;
-        if (isWindow()) {
-            // the frame strut may have changed (e.g. after minimize)
-            d_func()->updateFrameStrut();
-            newSize = data->crect.size();
-        } else {
-            newSize = QSize(SHORT1FROMMP(qmsg.mp2), SHORT2FROMMP(qmsg.mp2));
-            data->crect.setSize(newSize);
-        }
+        QSize newSize = QSize(SHORT1FROMMP(qmsg.mp2), SHORT2FROMMP(qmsg.mp2));
+        data->crect.setSize(newSize);
         if (isWindow()) {                        // update title/icon text
             d_func()->createTLExtra();

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -1411 +1411 @@
                     }
                 } else {
-                    d->updateFrameStrut();
+                    // @todo most likely, we don't need this as in PM the frame
+                    // strut seems to never change during window lifetime
+//                  d->updateFrameStrut();
                 }
             }
@@ -1821 +1823 @@
                 if (!q->isVisible())
                     WinInvalidateRect(q->internalWinId(), NULL, FALSE);
-
-                // If the layout has heightForWidth, the WinSetWindowPos() above can
-                // change the size/position, so refresh them.
-                WinQueryWindowPos(fId, &swp);
-                // flip y coordinate
-                swp.y = sh - (swp.y + swp.cy);
-                QRect fs(frameStrut());
-                data.crect.setRect(swp.x + fs.left(),
-                                   swp.y + fs.top(),
-                                   swp.cx - fs.left() - fs.right(),
-                                   swp.cy - fs.top() - fs.bottom());
-                isResize = data.crect.size() != oldSize;
+                if (!(swp.fl & SWP_MINIMIZE)) {
+                    // If the layout has heightForWidth, the WinSetWindowPos() above can
+                    // change the size/position, so refresh them. Note that if the
+                    // widget is minimized, we don't update its size in Qt (see
+                    // QApplication::translateConfigEvent()).
+                    WinQueryWindowPos(fId, &swp);
+                    // flip y coordinate
+                    swp.y = sh - (swp.y + swp.cy);
+                    QRect fs(frameStrut());
+                    data.crect.setRect(swp.x + fs.left(),
+                                       swp.y + fs.top(),
+                                       swp.cx - fs.left() - fs.right(),
+                                       swp.cy - fs.top() - fs.bottom());
+                    isResize = data.crect.size() != oldSize;
+                }
             } else {
                 q->setAttribute(Qt::WA_OutsideWSRange, false);