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

Timestamp:

Nov 5, 2009, 3:26:47 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Improved widget modality (widgets blocked by modality cannot be activated and moved using the mouse and the title bar anymore).

File:

• trunk/src/gui/kernel/qapplication_pm.cpp (modified) (1 diff)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -1203 +1203 @@
     qt_last_mouse_receiver = 0;
     ignoreNextMouseReleaseEvent = false;
+
+
+
+
+
+
+
+
+
+
 }
 
 void QApplicationPrivate::leaveModal_sys(QWidget *widget)
 {
-    if (qt_modal_stack && qt_modal_stack->removeAll(widget)) {
-        if (qt_modal_stack->isEmpty()) {
-            delete qt_modal_stack;
-            qt_modal_stack = 0;
-            QPoint p(QCursor::pos());
-            app_do_modal = false; // necessary, we may get recursively into qt_try_modal below
-            QWidget* w = QApplication::widgetAt(p.x(), p.y());
-            QWidget *leave = qt_last_mouse_receiver;
-            if (!leave)
-                leave = QWidget::find(curWin);
-            if (QWidget *grabber = QWidget::mouseGrabber()) {
-                w = grabber;
-                if (leave == w)
-                    leave = 0;
-            }
-            QApplicationPrivate::dispatchEnterLeave(w, leave); // send synthetic enter event
-            curWin = w ? w->effectiveWinId() : 0;
-            qt_last_mouse_receiver = w;
+    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()) {
+                delete qt_modal_stack;
+                qt_modal_stack = 0;
+                QPoint p(QCursor::pos());
+                app_do_modal = false; // necessary, we may get recursively into qt_try_modal below
+                QWidget* w = QApplication::widgetAt(p.x(), p.y());
+                QWidget *leave = qt_last_mouse_receiver;
+                if (!leave)
+                    leave = QWidget::find(curWin);
+                if (QWidget *grabber = QWidget::mouseGrabber()) {
+                    w = grabber;
+                    if (leave == w)
+                        leave = 0;
+                }
+                QApplicationPrivate::dispatchEnterLeave(w, leave); // send synthetic enter event
+                curWin = w ? w->effectiveWinId() : 0;
+                qt_last_mouse_receiver = w;
+            }
         }
         ignoreNextMouseReleaseEvent = true;