Changeset 154 for trunk

Timestamp:

Nov 13, 2006, 12:28:25 AM (19 years ago)

Author:

dmik

Message:

Kernel: Fixed recursion (that ate the entire stack) if the WShowModal flag was requested (or already set) when calling QWidget::reparent() and there was another modal widget visible.

Location:

trunk/src/kernel

Files:

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

trunk/src/kernel/qapplication_pm.cpp

@@ -2075 +2075 @@
 }
 
+static inline bool isChildOf( QWidget * child, QWidget * parent )
+{
+    if ( !parent || !child )
+        return FALSE;
+    QWidget * w = child;
+    while( w && w != parent )
+        w = w->parentWidget();
+    return w != 0;
+}
+
 Q_EXPORT void qt_enter_modal( QWidget *widget )
 {
@@ -2084 +2094 @@
     if ( qt_modal_stack->containsRef( widget ) )
         return; // already modal
+
+    QWidget *m = qt_modal_stack->first();
+    while ( m ) {
+        if ( isChildOf( m, widget ) )
+            return; // child is already modal (prevent endless recursion)
+        m = qt_modal_stack->next();
+    }
 
 //@@TODO (dmik): Qt/Win32 sends WindowBlocked/WindowUnblocked events only

trunk/src/kernel/qwidget_pm.cpp

@@ -1165 +1165 @@
         if (
             topModal && this != topModal && parentWidget() != topModal &&
-            isTopLevel() && !testWFlags( WGroupLeader )
+            isTopLevel() && !testWFlags( WGroupLeader ) &&
+            !testWFlags( WShowModal ) // don't block if we're going to be modal
         )
             blockedBy = topModal;