wip

include/FramelessHelper/Core/chromepalette.h

@@ -122,7 +122,7 @@ Q_SIGNALS:
     void chromeButtonColorChanged();
 
 private:
-    QScopedPointer<ChromePalettePrivate> d_ptr;
+    const QScopedPointer<ChromePalettePrivate> d_ptr;
 };
 
 FRAMELESSHELPER_END_NAMESPACE

include/FramelessHelper/Core/framelesshelper_qt.h

@@ -30,21 +30,26 @@
 
 FRAMELESSHELPER_BEGIN_NAMESPACE
 
+class FramelessHelperQtPrivate;
 class FRAMELESSHELPER_CORE_API FramelessHelperQt : public QObject
 {
     Q_OBJECT
     FRAMELESSHELPER_CLASS_INFO
     Q_DISABLE_COPY_MOVE(FramelessHelperQt)
+    Q_DECLARE_PRIVATE(FramelessHelperQt)
 
 public:
     explicit FramelessHelperQt(QObject *parent = nullptr);
     ~FramelessHelperQt() override;
 
-    static void addWindow(const QWindow *window);
-    static void removeWindow(const QWindow *window);
+    static void addWindow(const QObject *window);
+    static void removeWindow(const QObject *window);
 
 protected:
     Q_NODISCARD bool eventFilter(QObject *object, QEvent *event) override;
+
+private:
+    const QScopedPointer<FramelessHelperQtPrivate> d_ptr;
 };
 
 FRAMELESSHELPER_END_NAMESPACE

include/FramelessHelper/Core/framelessmanager.h

@@ -63,7 +63,7 @@ private:
     ~FramelessManager() override;
 
 private:
-    QScopedPointer<FramelessManagerPrivate> d_ptr;
+    const QScopedPointer<FramelessManagerPrivate> d_ptr;
 };
 
 FRAMELESSHELPER_END_NAMESPACE

include/FramelessHelper/Core/micamaterial.h

@@ -82,7 +82,7 @@ Q_SIGNALS:
     void shouldRedraw();
 
 private:
-    QScopedPointer<MicaMaterialPrivate> d_ptr;
+    const QScopedPointer<MicaMaterialPrivate> d_ptr;
 };
 
 FRAMELESSHELPER_END_NAMESPACE

include/FramelessHelper/Core/private/framelesshelpercore_global_p.h

@@ -134,14 +134,14 @@ struct FRAMELESSHELPER_CORE_API FramelessData
 {
     QObject *window = nullptr;
     WId windowId = 0;
-    QObject *winIdUpdater = nullptr;
+    QObject *eventFilter = nullptr;
     bool frameless = false;
     FramelessCallbacksPtr callbacks = nullptr;
     FramelessExtraDataHash extraData = {};
 
     FramelessData();
     virtual ~FramelessData();
-    
+
     using PtrType = std::shared_ptr<FramelessData>;
     [[nodiscard]] static PtrType create();
 

include/FramelessHelper/Core/utils.h

@@ -125,7 +125,6 @@ namespace Utils
 [[nodiscard]] FRAMELESSHELPER_CORE_API bool bringWindowToFront(const WId windowId);
 [[nodiscard]] FRAMELESSHELPER_CORE_API QPoint getWindowPlacementOffset(const WId windowId);
 [[nodiscard]] FRAMELESSHELPER_CORE_API QRect getWindowRestoreGeometry(const WId windowId);
-[[nodiscard]] FRAMELESSHELPER_CORE_API bool removeMicaWindow(const WId windowId);
 [[nodiscard]] FRAMELESSHELPER_CORE_API quint64 getKeyState();
 [[nodiscard]] FRAMELESSHELPER_CORE_API bool isValidWindow(const WId windowId, const bool checkVisible, const bool checkTopLevel);
 [[nodiscard]] FRAMELESSHELPER_CORE_API bool updateFramebufferTransparency(const WId windowId);

include/FramelessHelper/Core/windowborderpainter.h

@@ -79,7 +79,7 @@ Q_SIGNALS:
     void shouldRepaint();
 
 private:
-    QScopedPointer<WindowBorderPainterPrivate> d_ptr;
+    const QScopedPointer<WindowBorderPainterPrivate> d_ptr;
 };
 
 FRAMELESSHELPER_END_NAMESPACE

include/FramelessHelper/Quick/framelessquickhelper.h

@@ -111,7 +111,7 @@ Q_SIGNALS:
     void ready();
 
 private:
-    QScopedPointer<FramelessQuickHelperPrivate> d_ptr;
+    const QScopedPointer<FramelessQuickHelperPrivate> d_ptr;
 };
 
 FRAMELESSHELPER_END_NAMESPACE

include/FramelessHelper/Quick/private/framelessquickapplicationwindow_p.h

@@ -79,7 +79,7 @@ Q_SIGNALS:
     void fullScreenChanged();
 
 private:
-    QScopedPointer<FramelessQuickApplicationWindowPrivate> d_ptr;
+    const QScopedPointer<FramelessQuickApplicationWindowPrivate> d_ptr;
 };
 
 FRAMELESSHELPER_END_NAMESPACE

include/FramelessHelper/Quick/private/framelessquickwindow_p.h

@@ -79,7 +79,7 @@ Q_SIGNALS:
     void fullScreenChanged();
 
 private:
-    QScopedPointer<FramelessQuickWindowPrivate> d_ptr;
+    const QScopedPointer<FramelessQuickWindowPrivate> d_ptr;
 };
 
 FRAMELESSHELPER_END_NAMESPACE

include/FramelessHelper/Quick/quickmicamaterial.h

@@ -83,7 +83,7 @@ protected:
     void componentComplete() override;
 
 private:
-    QScopedPointer<QuickMicaMaterialPrivate> d_ptr;
+    const QScopedPointer<QuickMicaMaterialPrivate> d_ptr;
 };
 
 FRAMELESSHELPER_END_NAMESPACE

include/FramelessHelper/Quick/quickwindowborder.h

@@ -88,7 +88,7 @@ Q_SIGNALS:
     void nativeBorderChanged();
 
 private:
-    QScopedPointer<QuickWindowBorderPrivate> d_ptr;
+    const QScopedPointer<QuickWindowBorderPrivate> d_ptr;
 };
 
 FRAMELESSHELPER_END_NAMESPACE

include/FramelessHelper/Widgets/framelessdialog.h

@@ -45,7 +45,7 @@ public:
     ~FramelessDialog() override;
 
 private:
-    QScopedPointer<FramelessDialogPrivate> d_ptr;
+    const QScopedPointer<FramelessDialogPrivate> d_ptr;
 };
 
 FRAMELESSHELPER_END_NAMESPACE

include/FramelessHelper/Widgets/framelessmainwindow.h

@@ -60,7 +60,7 @@ Q_SIGNALS:
     void zoomedChanged();
 
 private:
-    QScopedPointer<FramelessMainWindowPrivate> d_ptr;
+    const QScopedPointer<FramelessMainWindowPrivate> d_ptr;
 };
 
 FRAMELESSHELPER_END_NAMESPACE

include/FramelessHelper/Widgets/framelesswidget.h

@@ -60,7 +60,7 @@ Q_SIGNALS:
     void zoomedChanged();
 
 private:
-    QScopedPointer<FramelessWidgetPrivate> d_ptr;
+    const QScopedPointer<FramelessWidgetPrivate> d_ptr;
 };
 
 FRAMELESSHELPER_END_NAMESPACE

include/FramelessHelper/Widgets/framelesswidgetshelper.h

@@ -98,7 +98,7 @@ Q_SIGNALS:
     void ready();
 
 private:
-    QScopedPointer<FramelessWidgetsHelperPrivate> d_ptr;
+    const QScopedPointer<FramelessWidgetsHelperPrivate> d_ptr;
 };
 
 FRAMELESSHELPER_END_NAMESPACE

include/FramelessHelper/Widgets/standardsystembutton.h

@@ -91,7 +91,7 @@ Q_SIGNALS:
     void glyphSizeChanged();
 
 private:
-    QScopedPointer<StandardSystemButtonPrivate> d_ptr;
+    const QScopedPointer<StandardSystemButtonPrivate> d_ptr;
 };
 
 FRAMELESSHELPER_END_NAMESPACE

include/FramelessHelper/Widgets/standardtitlebar.h

@@ -106,7 +106,7 @@ Q_SIGNALS:
     void titleFontChanged();
 
 private:
-    QScopedPointer<StandardTitleBarPrivate> d_ptr;
+    const QScopedPointer<StandardTitleBarPrivate> d_ptr;
 };
 
 FRAMELESSHELPER_END_NAMESPACE

src/core/framelesshelper_qt.cpp

@@ -52,37 +52,83 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
 
 using namespace Global;
 
-using FramelessHelperQtPtr = std::shared_ptr<FramelessHelperQt>;
-#define CreateFramelessHelperQt(...) std::make_shared<FramelessHelperQt>(__VA_ARGS__)
-
 struct FramelessDataQt : public FramelessData
 {
-    FramelessHelperQtPtr eventFilter = nullptr;
+    FramelessHelperQt *eventFilter = nullptr;
     bool cursorShapeChanged = false;
     bool leftButtonPressed = false;
+
+    FramelessDataQt();
+    ~FramelessDataQt() override;
 };
 using FramelessDataQtPtr = std::shared_ptr<FramelessDataQt>;
-#define CreateFramelessDataQt(...) std::make_shared<FramelessDataQt>(__VA_ARGS__)
 
-[[nodiscard]] FramelessDataQtPtr CreateEmptyDataQt() { return CreateFramelessDataQt(); }
+class FramelessHelperQtPrivate : public QObject
+{
+    Q_OBJECT
+    FRAMELESSHELPER_CLASS_INFO
+    Q_DISABLE_COPY_MOVE(FramelessHelperQtPrivate)
+    Q_DECLARE_PUBLIC(FramelessHelperQt)
 
-FramelessHelperQt::FramelessHelperQt(QObject *parent) : QObject(parent) {}
+public:
+    explicit FramelessHelperQtPrivate(FramelessHelperQt *q);
+    ~FramelessHelperQtPrivate() override;
+
+    FramelessHelperQt *q_ptr = nullptr;
+    const QObject *window = nullptr;
+};
+
+[[nodiscard]] static inline FramelessDataQtPtr tryGetData(const QObject *window)
+{
+    Q_ASSERT(window);
+    if (!window) {
+        return nullptr;
+    }
+    const FramelessDataPtr data = FramelessManagerPrivate::getData(window);
+    if (!data) {
+        return nullptr;
+    }
+    return std::dynamic_pointer_cast<FramelessDataQt>(data);
+}
+
+FramelessDataQt::FramelessDataQt() = default;
+
+FramelessDataQt::~FramelessDataQt() = default;
+
+[[nodiscard]] FramelessDataPtr FramelessData::create()
+{
+    return std::make_shared<FramelessDataQt>();
+}
+
+FramelessHelperQtPrivate::FramelessHelperQtPrivate(FramelessHelperQt *q) : QObject(q), q_ptr(q)
+{
+}
+
+FramelessHelperQtPrivate::~FramelessHelperQtPrivate() = default;
+
+FramelessHelperQt::FramelessHelperQt(QObject *parent) : QObject(parent), d_ptr(new FramelessHelperQtPrivate(this))
+{
+}
 
 FramelessHelperQt::~FramelessHelperQt() = default;
 
-void FramelessHelperQt::addWindow(const QWindow *window)
+void FramelessHelperQt::addWindow(const QObject *window)
 {
     Q_ASSERT(window);
     if (!window) {
         return;
     }
-    const auto data = std::dynamic_pointer_cast<FramelessDataQt>(FramelessManagerPrivate::getData(window));
-    Q_ASSERT(data->callbacks);
-    if (!data->callbacks) {
+    const FramelessDataQtPtr data = tryGetData(window);
+    if (!data || data->frameless || !data->callbacks) {
         return;
     }
-    data->eventFilter = CreateFramelessHelperQt();
-    const auto shouldApplyFramelessFlag = []() -> bool {
+    QWindow *qWindow = data->callbacks->getWindowHandle();
+    Q_ASSERT(qWindow);
+    if (!qWindow) {
+        return;
+    }
+    data->frameless = true;
+    static const auto shouldApplyFramelessFlag = []() -> bool {
 #ifdef Q_OS_MACOS
         return false;
 #elif (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID))
@@ -92,35 +138,46 @@ void FramelessHelperQt::addWindow(const QWindow *window)
 #endif // Q_OS_MACOS
     }();
 #if (defined(Q_OS_MACOS) && (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)))
-    window->setProperty("_q_mac_wantsLayer", 1);
+    qWindow->setProperty("_q_mac_wantsLayer", 1);
 #endif // (defined(Q_OS_MACOS) && (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)))
     if (shouldApplyFramelessFlag) {
         data->callbacks->setWindowFlags(data->callbacks->getWindowFlags() | Qt::FramelessWindowHint);
     } else {
 #if (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID))
-        std::ignore = Utils::tryHideSystemTitleBar(window, true);
+        std::ignore = Utils::tryHideSystemTitleBar(data->callbacks->getWindowId(), true);
 #elif defined(Q_OS_MACOS)
-        Utils::setSystemTitleBarVisible(window, false);
+        Utils::setSystemTitleBarVisible(data->callbacks->getWindowId(), false);
 #endif // Q_OS_LINUX
     }
-    const_cast<QWindow *>(window)->installEventFilter(data->eventFilter.get());
+    if (!data->eventFilter) {
+        data->eventFilter = new FramelessHelperQt(data->window);
+        data->eventFilter->d_func()->window = window;
+        qWindow->installEventFilter(data->eventFilter);
+    }
     FramelessHelperEnableThemeAware();
 }
 
-void FramelessHelperQt::removeWindow(const QWindow *window)
+void FramelessHelperQt::removeWindow(const QObject *window)
 {
     Q_ASSERT(window);
     if (!window) {
         return;
     }
-    const auto data = std::dynamic_pointer_cast<FramelessDataQt>(FramelessManagerPrivate::getData(window));
-    Q_ASSERT(data->eventFilter);
+    const FramelessDataQtPtr data = tryGetData(window);
+    if (!data || !data->frameless || !data->callbacks) {
+        return;
+    }
     if (data->eventFilter) {
-        const_cast<QWindow *>(window)->removeEventFilter(data->eventFilter.get());
-        data->eventFilter = nullptr;
+        QWindow *qWindow = data->callbacks->getWindowHandle();
+        Q_ASSERT(qWindow);
+        if (qWindow) {
+            qWindow->removeEventFilter(data->eventFilter);
+            delete data->eventFilter;
+            data->eventFilter = nullptr;
+        }
     }
 #ifdef Q_OS_MACOS
-    Utils::removeWindowProxy(window);
+    Utils::removeWindowProxy(data->callbacks->getWindowId());
 #endif
 }
 
@@ -131,22 +188,26 @@ bool FramelessHelperQt::eventFilter(QObject *object, QEvent *event)
     if (!object || !event) {
         return false;
     }
+    Q_D(FramelessHelperQt);
+    if (!d->window) {
+        return false;
+    }
 #if (QT_VERSION < QT_VERSION_CHECK(6, 5, 0))
     // First detect whether we got a theme change event or not, if so,
     // inform the user the system theme has changed.
     if (Utils::isThemeChangeEvent(event)) {
         // Sometimes the FramelessManager instance may be destroyed already.
-        if (FramelessManager * const manager = FramelessManager::instance()) {
+        if (FramelessManager *manager = FramelessManager::instance()) {
             if (FramelessManagerPrivate * const managerPriv = FramelessManagerPrivate::get(manager)) {
                 managerPriv->notifySystemThemeHasChangedOrNot();
             }
         }
-        return QObject::eventFilter(object, event);
+        return false;
     }
 #endif // (QT_VERSION < QT_VERSION_CHECK(6, 5, 0))
-    // We are only interested in events that are dispatched to top level windows.
+    // We are only interested in events that are dispatched to top level windows (not even top level widgets).
     if (!object->isWindowType()) {
-        return QObject::eventFilter(object, event);
+        return false;
     }
     const QEvent::Type type = event->type();
     // We are only interested in some specific mouse events (plus DPR change event).
@@ -158,10 +219,12 @@ bool FramelessHelperQt::eventFilter(QObject *object, QEvent *event)
             && (type != QEvent::ScreenChangeInternal) // Qt's internal event to notify screen change and DPR change.
 #endif // (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0))
             ) {
-        return QObject::eventFilter(object, event);
+        return false;
+    }
+    const FramelessDataQtPtr data = tryGetData(d->window);
+    if (!data || !data->frameless || !data->callbacks) {
+        return false;
     }
-    const auto window = qobject_cast<const QWindow *>(object);
-    const auto data = std::dynamic_pointer_cast<FramelessDataQt>(FramelessManagerPrivate::getData(window));
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0))
     if (type == QEvent::DevicePixelRatioChange)
 #else // QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
@@ -169,8 +232,9 @@ bool FramelessHelperQt::eventFilter(QObject *object, QEvent *event)
 #endif // (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0))
     {
         data->callbacks->forceChildrenRepaint(500);
-        return QObject::eventFilter(object, event);
+        return false;
     }
+    const auto qWindow = qobject_cast<QWindow *>(object);
     const auto mouseEvent = static_cast<QMouseEvent *>(event);
     const Qt::MouseButton button = mouseEvent->button();
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
@@ -190,9 +254,9 @@ bool FramelessHelperQt::eventFilter(QObject *object, QEvent *event)
         if (button == Qt::LeftButton) {
             data->leftButtonPressed = true;
             if (!windowFixedSize) {
-                const Qt::Edges edges = Utils::calculateWindowEdges(window, scenePos);
+                const Qt::Edges edges = Utils::calculateWindowEdges(qWindow, scenePos);
                 if (edges != Qt::Edges{}) {
-                    std::ignore = Utils::startSystemResize(const_cast<QWindow *>(window), edges, globalPos);
+                    std::ignore = Utils::startSystemResize(qWindow, edges, globalPos);
                     event->accept();
                     return true;
                 }
@@ -223,7 +287,7 @@ bool FramelessHelperQt::eventFilter(QObject *object, QEvent *event)
         break;
     case QEvent::MouseMove: {
         if (!dontOverrideCursor && !windowFixedSize) {
-            const Qt::CursorShape cs = Utils::calculateCursorShape(window, scenePos);
+            const Qt::CursorShape cs = Utils::calculateCursorShape(qWindow, scenePos);
             if (cs == Qt::ArrowCursor) {
                 if (data->cursorShapeChanged) {
                     data->callbacks->unsetCursor();
@@ -236,7 +300,7 @@ bool FramelessHelperQt::eventFilter(QObject *object, QEvent *event)
         }
         if (data->leftButtonPressed) {
             if (!ignoreThisEvent && insideTitleBar) {
-                std::ignore = Utils::startSystemMove(const_cast<QWindow *>(window), globalPos);
+                std::ignore = Utils::startSystemMove(qWindow, globalPos);
                 event->accept();
                 return true;
             }
@@ -245,9 +309,11 @@ bool FramelessHelperQt::eventFilter(QObject *object, QEvent *event)
     default:
         break;
     }
-    return QObject::eventFilter(object, event);
+    return false;
 }
 
 FRAMELESSHELPER_END_NAMESPACE
 
+#include "framelesshelper_qt.moc"
+
 #endif // !native_impl

src/core/framelessmanager.cpp

@@ -45,6 +45,7 @@
 #include <QtCore/qloggingcategory.h>
 #include <QtGui/qfontdatabase.h>
 #include <QtGui/qwindow.h>
+#include <QtGui/qevent.h>
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
 #  include <QtGui/qguiapplication.h>
 #  include <QtGui/qstylehints.h>
@@ -105,63 +106,56 @@ Q_GLOBAL_STATIC(InternalData, g_internalData)
 }
 #endif
 
-class WinIdUpdater : public QObject
+class InternalEventFilter : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY_MOVE(WinIdUpdater)
-    Q_PROPERTY(QObject* window READ window WRITE setWindow NOTIFY windowChanged FINAL)
+    FRAMELESSHELPER_CLASS_INFO
+    Q_DISABLE_COPY_MOVE(InternalEventFilter)
 
 public:
-    explicit WinIdUpdater(QObject *parent = nullptr);
-    ~WinIdUpdater() override;
-
-    Q_NODISCARD QObject *window() const;
-    void setWindow(QObject *window);
-
-Q_SIGNALS:
-    void windowChanged();
+    explicit InternalEventFilter(const QObject *window, QObject *parent = nullptr);
+    ~InternalEventFilter() override;
 
 protected:
     Q_NODISCARD bool eventFilter(QObject *object, QEvent *event) override;
 
 private:
-    QObject *m_window = nullptr;
+    const QObject *m_window = nullptr;
 };
 
-WinIdUpdater::WinIdUpdater(QObject *parent) : QObject(parent)
+InternalEventFilter::InternalEventFilter(const QObject *window, QObject *parent) : QObject(parent), m_window(window)
 {
+    Q_ASSERT(m_window);
+    Q_ASSERT(m_window->isWidgetType() || m_window->isWindowType());
 }
 
-WinIdUpdater::~WinIdUpdater() = default;
+InternalEventFilter::~InternalEventFilter() = default;
 
-QObject *WinIdUpdater::window() const
+bool InternalEventFilter::eventFilter(QObject *object, QEvent *event)
 {
-    return m_window;
-}
-
-void WinIdUpdater::setWindow(QObject *window)
-{
-    Q_ASSERT(window);
-    Q_ASSERT(window->isWidgetType() || window->isWindowType());
-    if (!window || !(window->isWidgetType() || window->isWindowType()) || (m_window == window)) {
-        return;
+    if (!object || !m_window || (object != m_window)) {
+        return false;
     }
-    m_window = window;
-    Q_EMIT windowChanged();
-}
-
-bool WinIdUpdater::eventFilter(QObject *object, QEvent *event)
-{
-    if (m_window && object && (object == m_window) && (event->type() == QEvent::WinIdChange)) {
-        if (const FramelessDataPtr data = FramelessManagerPrivate::getData(m_window)) {
-            if (data->frameless && data->callbacks) {
-                const WId windowId = data->callbacks->getWindowId();
-                Q_ASSERT(windowId);
-                if (windowId) {
-                    FramelessManagerPrivate::updateWindowId(m_window, windowId);
-                }
-            }
+    const FramelessDataPtr data = FramelessManagerPrivate::getData(m_window);
+    if (!data || !data->frameless || !data->callbacks) {
+        return false;
+    }
+    switch (event->type()) {
+    case QEvent::WinIdChange: {
+        const WId windowId = data->callbacks->getWindowId();
+        Q_ASSERT(windowId);
+        if (windowId) {
+            FramelessManagerPrivate::updateWindowId(m_window, windowId);
         }
+    } break;
+    case QEvent::Close: {
+        const auto ce = static_cast<QCloseEvent *>(event);
+        if (ce->isAccepted()) {
+            std::ignore = FramelessManager::instance()->removeWindow(m_window);
+        }
+    } break;
+    default:
+        break;
     }
     return false;
 }
@@ -324,10 +318,8 @@ FramelessDataPtr FramelessManagerPrivate::createData(const QObject *window, cons
         FramelessDataPtr data = FramelessData::create();
         data->window = win;
         data->windowId = windowId;
-        const auto winIdUpdater = new WinIdUpdater(data->window);
-        winIdUpdater->setWindow(data->window);
-        data->window->installEventFilter(winIdUpdater);
-        data->winIdUpdater = winIdUpdater;
+        data->eventFilter = new InternalEventFilter(data->window, data->window);
+        data->window->installEventFilter(data->eventFilter);
         it = g_internalData()->dataMap.insert(win, data);
         g_internalData()->windowMap.insert(windowId, win);
     }
@@ -508,11 +500,9 @@ bool FramelessManager::addWindow(const QObject *window, const WId windowId)
         g_internalData()->dataMap.insert(data->window, data);
         g_internalData()->windowMap.insert(windowId, data->window);
     }
-    if (!data->winIdUpdater) {
-        const auto winIdUpdater = new WinIdUpdater(data->window);
-        winIdUpdater->setWindow(data->window);
-        data->window->installEventFilter(winIdUpdater);
-        data->winIdUpdater = winIdUpdater;
+    if (!data->eventFilter) {
+        data->eventFilter = new InternalEventFilter(data->window, data->window);
+        data->window->installEventFilter(data->eventFilter);
     }
 #if FRAMELESSHELPER_CONFIG(native_impl)
 #  ifdef Q_OS_WINDOWS
@@ -523,9 +513,11 @@ bool FramelessManager::addWindow(const QObject *window, const WId windowId)
 #  else
 #  endif
 #else
+#  ifdef Q_OS_WINDOWS
+    std::ignore = Utils::installWindowProcHook(windowId);
+#  endif
     FramelessHelperQt::addWindow(window);
 #endif
-    connect(window, &QObject::destroyed, FramelessManager::instance(), [this, window](){ std::ignore = removeWindow(window); });
     return true;
 }
 
@@ -546,22 +538,24 @@ bool FramelessManager::removeWindow(const QObject *window)
     if (!data || !data->window || !data->windowId) {
         return false;
     }
-    if (data->winIdUpdater) {
-        data->window->removeEventFilter(data->winIdUpdater);
-        data->winIdUpdater->deleteLater();
-        data->winIdUpdater = nullptr;
+    if (data->eventFilter) {
+        data->window->removeEventFilter(data->eventFilter);
+        delete data->eventFilter;
+        data->eventFilter = nullptr;
     }
 #if FRAMELESSHELPER_CONFIG(native_impl)
 #  ifdef Q_OS_WINDOWS
     FramelessHelperWin::removeWindow(window);
     std::ignore = Utils::uninstallWindowProcHook(data->windowId);
-    std::ignore = Utils::removeMicaWindow(data->windowId);
 #  elif (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID))
 #  elif defined(Q_OS_MACOS)
 #  else
 #  endif
 #else
     FramelessHelperQt::removeWindow(window);
+#  ifdef Q_OS_WINDOWS
+    std::ignore = Utils::uninstallWindowProcHook(data->windowId);
+#  endif
 #endif
     g_internalData()->dataMap.erase(it);
     g_internalData()->windowMap.remove(data->windowId);

src/core/utils.cpp

@@ -218,12 +218,10 @@ bool Utils::moveWindowToDesktopCenter(const WId windowId, const bool considerTas
         return false;
     }
     const QObject *window = FramelessManagerPrivate::getWindow(windowId);
-    Q_ASSERT(window);
     if (!window) {
         return false;
     }
     const FramelessDataPtr data = FramelessManagerPrivate::getData(window);
-    Q_ASSERT(data);
     if (!data || !data->callbacks) {
         return false;
     }
@@ -587,7 +585,7 @@ quint32 Utils::defaultScreenDpi()
 QColor Utils::getAccentColor()
 {
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0))
-    return QGuiApplication::palette().color(QPalette::AccentColor);
+    return QGuiApplication::palette().color(QPalette::Accent);
 #else // (QT_VERSION < QT_VERSION_CHECK(6, 6, 0))
 #  ifdef Q_OS_WINDOWS
     return getAccentColor_windows();

src/core/utils_win.cpp

@@ -923,6 +923,7 @@ static constexpr const std::array<Win32Message, 333> g_win32MessageMap =
     if (!qWindow) {
         return defaultWindowProcessing();
     }
+#if FRAMELESSHELPER_CONFIG(native_impl)
     // https://github.com/qt/qtbase/blob/e26a87f1ecc40bc8c6aa5b889fce67410a57a702/src/plugins/platforms/windows/qwindowscontext.cpp#L1025
     // We can see from the source code that Qt will filter out some messages first and then send the unfiltered
     // messages to the event dispatcher. To activate the Snap Layout feature on Windows 11, we must process
@@ -971,6 +972,7 @@ static constexpr const std::array<Win32Message, 333> g_win32MessageMap =
             return LRESULT(filterResult);
         }
     }
+#endif // native_impl
     const auto getNativePosFromMouse = [lParam]() -> QPoint {
         return {GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)};
     };
@@ -3049,29 +3051,6 @@ QRect Utils::getWindowRestoreGeometry(const WId windowId)
     return rect2qrect(wp.rcNormalPosition).translated(getWindowPlacementOffset(windowId));
 }
 
-bool Utils::removeMicaWindow(const WId windowId)
-{
-    Q_ASSERT(windowId);
-    if (!windowId) {
-        return false;
-    }
-    const QObject *window = FramelessManagerPrivate::getWindow(windowId);
-    if (!window) {
-        return false;
-    }
-    const FramelessDataPtr data = FramelessManagerPrivate::getData(window);
-    if (!data) {
-        return false;
-    }
-    const UtilsWinExtraDataPtr extraData = tryGetExtraData(data, false);
-    Q_ASSERT(extraData);
-    if (!extraData || !extraData->mica) {
-        return false;
-    }
-    extraData->mica = false;
-    return true;
-}
-
 quint64 Utils::getKeyState()
 {
     quint64 result = 0;