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

Timestamp:

Aug 19, 2009, 11:26:52 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: 1) Fixed window state change handling so that the window is properly redrawn after being un-minimized using the window manager command. 2) Fixed frame strut update during minimize.

File:

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

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -90 +90 @@
         // WC_FRAME parent HWND internally maintaned for them
         cname = QLatin1String("QWindow");
-        style |= CS_MOVENOTIFY;
     } else {
         cname = QLatin1String("QWidget");
@@ -1393 +1392 @@
         Q_ASSERT(fId != NULLHANDLE);
 
-        // set flag for the WM_WINDOWPOSCHANGED handler in QtFrameProc
-        d->topData()->inSetWindowState = true;
-
         // Ensure the initial size is valid, since we store it as normalGeometry below.
         if (!testAttribute(Qt::WA_Resized) && !isVisible())
@@ -1458 +1454 @@
             }
         }
-
-        // set flag for the WM_WINDOWPOSCHANGED handler in QtFrameProc
-        d->topData()->inSetWindowState = false;
-    }
+    }
+
     data->window_state = newstate;
-    QWindowStateChangeEvent e(oldstate);
-    QApplication::sendEvent(this, &e);
+    // Note: QWindowStateChangeEvent is sent from QtWndProc(WM_MINMAXFRAME)
 }
 
@@ -1940 +1933 @@
     extra->topextra->fId = NULLHANDLE;
     extra->topextra->swEntry = NULLHANDLE;
-    extra->topextra->inSetWindowState = false;
 }
 
@@ -1989 +1981 @@
     fs.setCoords(cswp.x, cswp.y, swp.cx - cswp.x - cswp.cx,
                                  swp.cy - cswp.y - cswp.cy);
-    // @todo do we really need to update crect here??
-    //data.crect.setRect(swp.x + cswp.x, swp.y + cswp.y, cswp.cx, cswp.cy);
+    data.crect.setRect(swp.x + cswp.x, swp.y + cswp.y, cswp.cx, cswp.cy);
 
     data.fstrut_dirty = false;