1 files changed, 41 insertions, 8 deletions

diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h
index 46bc504f5f..ac531ef28f 100644
--- a/src/gui/kernel/qguiapplication_p.h
+++ b/src/gui/kernel/qguiapplication_p.h
@@ -34,10 +34,14 @@
 #  include "private/qshortcutmap_p.h"
 #endif
 
+#include <QtCore/qpointer.h>
+
 #include <memory>
 
 QT_BEGIN_NAMESPACE
 
+Q_DECLARE_LOGGING_CATEGORY(lcPopup)
+
 class QColorTrcLut;
 class QPlatformIntegration;
 class QPlatformTheme;
@@ -113,9 +117,11 @@ public:
     static void processEnterEvent(QWindowSystemInterfacePrivate::EnterEvent *e);
     static void processLeaveEvent(QWindowSystemInterfacePrivate::LeaveEvent *e);
 
-    static void processActivatedEvent(QWindowSystemInterfacePrivate::ActivatedWindowEvent *e);
+    static void processFocusWindowEvent(QWindowSystemInterfacePrivate::FocusWindowEvent *e);
+
     static void processWindowStateChangedEvent(QWindowSystemInterfacePrivate::WindowStateChangedEvent *e);
     static void processWindowScreenChangedEvent(QWindowSystemInterfacePrivate::WindowScreenChangedEvent *e);
+    static void processWindowDevicePixelRatioChangedEvent(QWindowSystemInterfacePrivate::WindowDevicePixelRatioChangedEvent *e);
 
     static void processSafeAreaMarginsChangedEvent(QWindowSystemInterfacePrivate::SafeAreaMarginsChangedEvent *e);
 
@@ -192,8 +198,11 @@ public:
     virtual Qt::WindowModality defaultModality() const;
     virtual bool windowNeverBlocked(QWindow *window) const;
     bool isWindowBlocked(QWindow *window, QWindow **blockingWindow = nullptr) const;
-    virtual bool popupActive() { return false; }
-    virtual bool closeAllPopups() { return false; }
+    static qsizetype popupCount() { return QGuiApplicationPrivate::popup_list.size(); }
+    static QWindow *activePopupWindow();
+    static void activatePopup(QWindow *popup);
+    static bool closePopup(QWindow *popup);
+    static bool closeAllPopups();
 
     static Qt::MouseButton mousePressButton;
     static struct QLastCursorPosition {
@@ -206,6 +215,28 @@ public:
 
         constexpr void reset() noexcept { *this = QLastCursorPosition{}; }
 
+        // QGuiApplicationPrivate::lastCursorPosition is used for mouse-move detection
+        // but even QPointF's qFuzzCompare on doubles is too precise, and causes move-noise
+        // e.g. on macOS (see QTBUG-111170). So we specialize the equality operators here
+        // to use single-point precision.
+        friend constexpr bool operator==(const QLastCursorPosition &p1, const QPointF &p2) noexcept
+        {
+            return qFuzzyCompare(float(p1.x()), float(p2.x()))
+                && qFuzzyCompare(float(p1.y()), float(p2.y()));
+        }
+        friend constexpr bool operator!=(const QLastCursorPosition &p1, const QPointF &p2) noexcept
+        {
+            return !(p1 == p2);
+        }
+        friend constexpr bool operator==(const QPointF &p1, const QLastCursorPosition &p2) noexcept
+        {
+            return p2 == p1;
+        }
+        friend constexpr bool operator!=(const QPointF &p1, const QLastCursorPosition &p2) noexcept
+        {
+            return !(p2 == p1);
+        }
+
     private:
         QPointF thePoint;
     } lastCursorPosition;
@@ -232,6 +263,8 @@ public:
     static QPalette *app_pal;
 
     static QWindowList window_list;
+    static QWindowList popup_list;
+    static const QWindow *active_popup_on_press;
     static QWindow *focus_window;
 
 #ifndef QT_NO_CURSOR
@@ -244,6 +277,7 @@ public:
     static QString styleOverride;
     static QStyleHints *styleHints;
     static bool obey_desktop_settings;
+    static bool popup_closed_on_press;
     QInputMethod *inputMethod;
 
     QString firstWindowTitle;
@@ -297,6 +331,8 @@ public:
 
     static void updatePalette();
 
+    static QEvent::Type contextMenuEventType();
+
 protected:
     virtual void handleThemeChanged();
 
@@ -312,8 +348,7 @@ private:
     static void clearPalette();
 
     friend class QDragManager;
-
-    static Qt::Appearance appearance();
+    friend class QWindowPrivate;
 
     static QGuiApplicationPrivate *self;
     static int m_fakeMouseSourcePointId;
@@ -377,8 +412,6 @@ struct Q_GUI_EXPORT QWindowsApplication
     virtual bool isWinTabEnabled() const = 0;
     virtual bool setWinTabEnabled(bool enabled) = 0;
 
-    virtual bool isDarkMode() const = 0;
-
     virtual DarkModeHandling darkModeHandling() const = 0;
     virtual void setDarkModeHandling(DarkModeHandling handling) = 0;
 
@@ -397,7 +430,7 @@ struct Q_GUI_EXPORT QWindowsApplication
     virtual QVariant gpu() const = 0; // internal, used by qtdiag
     virtual QVariant gpuList() const = 0;
 
-    virtual void lightSystemPalette(QPalette &pal) const = 0;
+    virtual void populateLightSystemPalette(QPalette &pal) const = 0;
 };
 #endif // Q_OS_WIN