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

Timestamp:

Sep 16, 2009, 10:34:10 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed: Close popups when resizing/moving the top level window.

File:

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

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -742 +742 @@
                             int maxiter = 1024;
                             QWidget *popup;
-                            while ( (popup=QApplication::activePopupWidget()) && maxiter-- )
+                            while ((popup=QApplication::activePopupWidget()) && maxiter--)
                                 popup->close();
                         }
@@ -947 +947 @@
             if (widget->translateConfigEvent(qmsg))
                 return (MRESULT)TRUE;
+            break;
+        }
+
+        case WM_TRACKFRAME: {
+            if (QApplication::activePopupWidget()) {
+                // Another application was activated while our popups are open,
+                // then close all popups.  In case some popup refuses to close,
+                // we give up after 1024 attempts (to avoid an infinite loop).
+                int maxiter = 1024;
+                QWidget *popup;
+                while ((popup=QApplication::activePopupWidget()) && maxiter--)
+                    popup->close();
+            }
             break;
         }
@@ -2127 +2140 @@
 
     default:
+#if 0
+        if (qmsg.msg == WM_QUERYICON)
+            break;
+        str = QString().sprintf("WM_%04lX: hwnd %08lX.", qmsg.msg, qmsg.hwnd);
+        str += qWidgetName(qWidgetFromHWND(qmsg.hwnd));
+#endif
         break;
     }