another take on popups

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index e0b1c00..3703ae6 100644 (file)
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -861,7 +861,7 @@ QApplication::Type QApplication::type()
 
 QWidget *QApplication::activePopupWidget()
 {
-    if (QApplicationPrivate::popupWidgets && !QApplicationPrivate::popupWidgets->isEmpty())
+    if (QApplicationPrivate::popupWidgets)
         QApplicationPrivate::popupWidgets->last();
     return Q_NULLPTR;
 }

diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index 20b8b41..e57bee7 100644 (file)
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -4097,9 +4097,9 @@ bool QETWidget::translateMouseEvent(const XEvent *event)
     if (type == 0)                                // don't send event
         return false;
 
-    QWidget *popup = qApp->activePopupWidget();
-    if (popup) {                        // in popup mode
-        QWidget *activePopupWidget = qApp->activePopupWidget();
+    if (QApplicationPrivate::popupWidgets) {                        // in popup mode
+        QWidget *popup = QApplicationPrivate::popupWidgets->last();
+        QWidget *activePopupWidget = QApplicationPrivate::popupWidgets->last();
         if (popup != this) {
             if (event->type == LeaveNotify)
                 return false;