Changeset 938 for trunk/src/gui/kernel/qapplication_pm.cpp

Timestamp:

Aug 4, 2011, 8:42:53 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: gui: Make blocked widgets follow modal on Z-order change.

This makes sure that whenever the modal widget is brought
to front, all the ones it blocks will be placed right underneath it
keeping their original z-order at the time of blocking.

File:

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

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -144 +144 @@
     QRect frameStrut() const { return d_func()->frameStrut(); }
     HWND frameWinId() const { return d_func()->frameWinId(); }
+    QETWidget* modalBlocker() const { return (QETWidget *)d_func()->modalBlocker(); }
     bool        pmEvent(QMSG *m, MRESULT *r) { return QWidget::pmEvent(m, r); }
 //  void        markFrameStrutDirty() { data->fstrut_dirty = 1; }
@@ -1268 +1269 @@
 }
 
+static void qt_pull_blocked_widgets(QETWidget *widget)
+{
+    QWidgetList list = QApplication::topLevelWidgets();
+    foreach (QWidget *w, list) {
+        QETWidget *ew = (QETWidget *)w;
+        QETWidget *above = (QETWidget*)ew->modalBlocker();
+        if (above == widget) {
+            WinSetWindowPos(ew->frameWinId(), widget->frameWinId(),
+                            0, 0, 0, 0, SWP_ZORDER);
+            qt_pull_blocked_widgets(ew);
+        }
+    }
+}
+
 PFNWP QtOldFrameProc = 0;
 
 MRESULT EXPENTRY QtFrameProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
+    static bool pullingBlockedWigets = false;
+
     do {
         if (!qApp) // unstable app state
@@ -1315 +1332 @@
             // If PM tries to activate a modally blocked window, pass activation
             // over to the top modal window instead of letting it activate the
-            // blocked one. Z-order changes are simply ignored for now.
-            // @todo Blocked widgets should keep Z-order WRT their modal
-            // blockers whenever they move (e.g. bringing the modal one to top
-            // should also put the one it blocks right under it instead of
-            // possibly leaving it somewhere behind other windows).
+            // blocked one
             PSWP pswp =(PSWP)qmsg.mp1;
             if (app_do_modal &&
                 ((pswp->fl & SWP_ACTIVATE) || (pswp->fl & SWP_ZORDER))) {
-                QWidget *top = 0;
-                if (!QApplicationPrivate::tryModalHelper(widget, &top) && top && widget != top) {
+                QETWidget *above = (QETWidget *)widget->modalBlocker();
+                if (above) {
                     if (pswp->fl & SWP_ACTIVATE) {
-                        if (top->isVisible()) {
-                            top->activateWindow();
-                        } else {
-                            // This is the case when native file dialogs are shown
-                            QWidget *p = (top->parentWidget() ? top->parentWidget()->window() : 0);
-                            if (p && p->isVisible()) {
-                                p->activateWindow();
-                            }
-                        }
+                        // find the blocker that isn't blocked itself and
+                        // delegate activation to it (WM_WINDOWPOSCHANGED will
+                        // care about the rest)
+                        while (above->modalBlocker())
+                            above = above->modalBlocker();
+                        WinSetWindowPos(above->frameWinId(), HWND_TOP, 0, 0, 0, 0,
+                                        SWP_ACTIVATE | SWP_ZORDER);
                         pswp->fl &= ~SWP_ACTIVATE;
                     }
                     if (pswp->fl & SWP_ZORDER) {
-                        pswp->fl &= ~SWP_ZORDER;
+                        // forbid changing the Z-order of the blocked widget
+                        // (except when it is moved right under its blocker)
+                        if (pswp->hwndInsertBehind != above->frameWinId())
+                            pswp->fl &= ~SWP_ZORDER;
                     }
                 }
+            }
+            break;
+        }
+
+        case WM_WINDOWPOSCHANGED: {
+            PSWP pswp =(PSWP)qmsg.mp1;
+            // make sure blocked widgets stay behind the blocker on Z-order change
+            if (app_do_modal && (pswp->fl & SWP_ZORDER) && !pullingBlockedWigets) {
+                // protect against various kinds of recursion (e.g. when the
+                // blocked widgets are PM owners of the blocker in which case PM
+                // manages pulling on its own and will put us in a loop)
+                pullingBlockedWigets = true;
+                qt_pull_blocked_widgets(widget);
+                pullingBlockedWigets = false;
             }
             break;
@@ -1478 +1506 @@
     // programmatically, e.g. from the Window List)
     QWidgetList list = QApplication::topLevelWidgets();
-    foreach(QWidget *w, list) {
+    foreach (QWidget *w, list) {
         if (w != widget && QApplicationPrivate::isBlockedByModal(w)) {
-            WinEnableWindow(w->d_func()->frameWinId(), FALSE);
+            if (!w->d_func()->modalBlocker()) {
+                WinEnableWindow(w->d_func()->frameWinId(), FALSE);
+                // also remember the blocker widget so that the blocked one can
+                // pass activation attempts to it (note that the blocker is not
+                // necessarily modal itself, it's just the window right above
+                // the one being blocked, we will use this to restore z-order of
+                // of blocked widgets in qt_pull_blocked_widgets())
+                QWidget *widgetAbove = 0;
+                HWND above = w->d_func()->frameWinId();
+                while (!widgetAbove) {
+                    above = WinQueryWindow(above, QW_PREV);
+                    if (!above)
+                        break;
+                    widgetAbove = qt_widget_from_hwnd(above);
+                }
+                if (!widgetAbove)
+                    widgetAbove = widget;
+                w->d_func()->setModalBlocker(widgetAbove);
+            }
         }
     }
@@ -1515 +1561 @@
         foreach(QWidget *w, list) {
             if (w != widget && !QApplicationPrivate::isBlockedByModal(w)) {
-                WinEnableWindow(w->d_func()->frameWinId(), TRUE);
+                if (w->d_func()->modalBlocker()) {
+                    w->d_func()->setModalBlocker(0);
+                    WinEnableWindow(w->d_func()->frameWinId(), TRUE);
+                }
             }
         }