Changeset 936 for trunk/src/gui

Timestamp:

Aug 4, 2011, 12:42:23 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: Fixed: Modal widgets could go to behind blocked ones.

This in particular affected parent-less modal widgets (e.g. the
Session Manager dialog in Qt Creator).

File:

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

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -143 +143 @@
     QWidgetPrivate *dptr() { return d_func(); }
     QRect frameStrut() const { return d_func()->frameStrut(); }
+
     bool        pmEvent(QMSG *m, MRESULT *r) { return QWidget::pmEvent(m, r); }
 //  void        markFrameStrutDirty() { data->fstrut_dirty = 1; }
@@ -1102 +1103 @@
                         // FID_SYSMENU) should not cause the focus to be lost.
                         if (WinQueryWindow(hwnd, QW_OWNER) ==
-                                ((QETWidget*)widget->window())->dptr()->frameWinId())
+                                ((QETWidget*)widget->window())->frameWinId())
                             break;
                         if (!widget->isWindow())
@@ -1311 +1312 @@
         }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         case WM_QUERYTRACKINFO: {
             QWExtra *x = widget->xtra();
@@ -1439 +1473 @@
     ignoreNextMouseReleaseEvent = false;
 
-    // go through all top-level widgets and disable those that should be
-    // blocked by the modality (this in particular will disable activation
-    // through clicking on the title bar and also state change throuhg titlebar
-    // buttons)
+    // go through all top-level widgets and disable those that should be
+    // b
+    // 
+    // )
     QWidgetList list = QApplication::topLevelWidgets();
     foreach(QWidget *w, list) {
-        if (QApplicationPrivate::isBlockedByModal(w))
+        if (
             WinEnableWindow(w->d_func()->frameWinId(), FALSE);
+
     }
 }
@@ -1453 +1488 @@
 {
     if (qt_modal_stack) {
-        // go through all affected top-level widgets and re-enable them
-        QWidgetList list = QApplication::topLevelWidgets();
-        foreach(QWidget *w, list) {
-            if (QApplicationPrivate::isBlockedByModal(w))
-                WinEnableWindow(w->d_func()->frameWinId(), TRUE);
-        }
         if (qt_modal_stack->removeAll(widget)) {
             if (qt_modal_stack->isEmpty()) {
@@ -1480 +1509 @@
         }
         ignoreNextMouseReleaseEvent = true;
+
+
+
+
+
+
+
+
+
     }
     app_do_modal = qt_modal_stack != 0;
@@ -2732 +2770 @@
     myCaseEnd()
 
+
+
+
+
+
+
     myCaseBegin(WM_WINDOWPOSCHANGED)
         debug << *((PSWP) qmsg.mp1);
@@ -2785 +2829 @@
     myCaseEnd()
 
-    myCaseBegin(WM_ADJUSTWINDOWPOS)
-        break;
-    myCaseEnd()
-
     myCaseBegin(WM_VRNDISABLED)
         break;
@@ -2797 +2837 @@
 
     myCaseBegin(WM_SHOW)
+
+
+
+
+
+
+
         break;
     myCaseEnd()