Changeset 432 for trunk/src/gui/util/qsystemtrayicon_pm.cpp

Timestamp:

Dec 18, 2009, 2:36:30 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed: Popups shown when another application is active were not controllable with keyboard and didn't close on an outside mouse click (closes #113).

File:

• trunk/src/gui/util/qsystemtrayicon_pm.cpp (modified) (4 diffs)

trunk/src/gui/util/qsystemtrayicon_pm.cpp

@@ -158 +158 @@
 }
 
+static void closeNormalPopups()
+{
+    if (QApplication::activePopupWidget()) {
+        // The system tray area is actually another application so we close all
+        // normal popups for consistency (see qapplication_pm.cpp). 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();
+    }
+}
+
 bool QSystemTrayIconSys::pmEvent(QMSG *msg, MRESULT *result)
 {
@@ -165 +179 @@
             switch (SHORT2FROMMP(msg->mp1)) {
                 case XST_IN_MOUSE: {
+                    closeNormalPopups();
                     PXSTMOUSEMSG pMsg = (PXSTMOUSEMSG)msg->mp2;
                     switch (pMsg->ulMouseMsg) {
@@ -182 +197 @@
                 }
                 case XST_IN_CONTEXT: {
+                    closeNormalPopups();
+                    if (QApplication::activePopupWidget()) {
+                        // The system tray area is actually another application
+                        // so we close all normal popups for consistency (see
+                        // qapplication_pm.cpp). 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();
+                    }
                     PXSTCONTEXTMSG pMsg = (PXSTCONTEXTMSG)msg->mp2;
                     if (q->contextMenu()) {
@@ -196 +223 @@
                     break;
                 }
+                case XST_IN_WHEEL: {
+                    closeNormalPopups();
+                }
                 default:
                     break;