win: fix some minor bugs

CMakeLists.txt

@@ -221,6 +221,20 @@ add_project_config(KEY "system_button" CONDITION NOT FRAMELESSHELPER_NO_SYSTEM_B
 add_project_config(KEY "native_impl" CONDITION FRAMELESSHELPER_NATIVE_IMPL)
 generate_project_config(PATH "${FRAMELESSHELPER_CONFIG_FILE}")
 
+function(setup_custom_moc_macros)
+    cmake_parse_arguments(arg "" "" "TARGETS" ${ARGN})
+    if(arg_UNPARSED_ARGUMENTS)
+        message(AUTHOR_WARNING "setup_custom_moc_macros: Unrecognized arguments: ${arg_UNPARSED_ARGUMENTS}")
+    endif()
+    foreach(__target ${arg_TARGETS})
+        if(NOT TARGET ${__target})
+            message(AUTHOR_WARNING "${__target} is not a valid CMake target!")
+            continue()
+        endif()
+        set_property(TARGET ${__target} APPEND PROPERTY AUTOMOC_MACRO_NAMES "FRAMELESSHELPER_QT_CLASS;FRAMELESSHELPER_PUBLIC_QT_CLASS;FRAMELESSHELPER_PRIVATE_QT_CLASS")
+    endforeach()
+endfunction()
+
 if(FRAMELESSHELPER_BUILD_WIDGETS OR FRAMELESSHELPER_BUILD_QUICK)
     add_subdirectory(src)
 endif()

examples/quick/qml/ApplicationWindow.qml

@@ -35,7 +35,7 @@ FramelessApplicationWindow {
     height: 600
     title: qsTr("FramelessHelper demo application - Qt Quick [") + objectName + ']'
     color: {
-        if (FramelessHelper.blurBehindWindowEnabled) {
+        if (FramelessHelper.blurBehindWindowEnabled && FramelessUtils.blurBehindWindowSupported) {
             return "transparent";
         }
         if (FramelessUtils.systemTheme === FramelessHelperConstants.Dark) {

examples/quick/qml/Window.qml

@@ -35,7 +35,7 @@ FramelessWindow {
     height: 600
     title: qsTr("FramelessHelper demo application - Qt Quick [") + objectName +']'
     color: {
-        if (FramelessHelper.blurBehindWindowEnabled) {
+        if (FramelessHelper.blurBehindWindowEnabled && FramelessUtils.blurBehindWindowSupported) {
             return "transparent";
         }
         if (FramelessUtils.systemTheme === FramelessHelperConstants.Dark) {

examples/widget/widget.cpp

@@ -34,6 +34,7 @@
 #include <QtWidgets/qboxlayout.h>
 #include <QtWidgets/qfileiconprovider.h>
 #include <FramelessHelper/Core/framelessmanager.h>
+#include <FramelessHelper/Core/utils.h>
 #include <FramelessHelper/Widgets/framelesswidgetshelper.h>
 #include <FramelessHelper/Widgets/standardtitlebar.h>
 #include <FramelessHelper/Widgets/standardsystembutton.h>
@@ -187,7 +188,7 @@ void Widget::updateStyleSheet()
     m_clockLabel->setStyleSheet(labelStyleSheet);
     m_compilerInfoLabel->setStyleSheet(labelStyleSheet);
     m_commitInfoLabel->setStyleSheet(labelStyleSheet);
-    if (FramelessWidgetsHelper::get(this)->isBlurBehindWindowEnabled()) {
+    if (FramelessWidgetsHelper::get(this)->isBlurBehindWindowEnabled() && Utils::isBlurBehindWindowSupported()) {
         setStyleSheet(FRAMELESSHELPER_STRING_LITERAL("background-color: transparent;"));
     } else {
         const QColor windowBackgroundColor = (dark ? kDefaultSystemDarkColor : kDefaultSystemLightColor);

include/FramelessHelper/Core/chromepalette.h

@@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
 class ChromePalettePrivate;
 class FRAMELESSHELPER_CORE_API ChromePalette : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_PUBLIC_QT_CLASS(ChromePalette)
 
     Q_PROPERTY(QColor titleBarActiveBackgroundColor READ titleBarActiveBackgroundColor

include/FramelessHelper/Core/framelesshelper_qt.h

@@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
 class FramelessHelperQtPrivate;
 class FRAMELESSHELPER_CORE_API FramelessHelperQt : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessHelperQt)
 
 public:

include/FramelessHelper/Core/framelesshelpercore_global.h

@@ -316,6 +316,7 @@ QT_END_NAMESPACE
 #ifndef FRAMELESSHELPER_QT_CLASS
 #  define FRAMELESSHELPER_QT_CLASS(Class) \
   private: \
+      Q_OBJECT \
       FRAMELESSHELPER_CLASS_INFO \
       FRAMELESSHELPER_CLASS(Class)
 #endif

include/FramelessHelper/Core/framelessmanager.h

@@ -32,7 +32,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
 class FramelessManagerPrivate;
 class FRAMELESSHELPER_CORE_API FramelessManager : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessManager)
     Q_PROPERTY(Global::SystemTheme systemTheme READ systemTheme WRITE setOverrideTheme NOTIFY systemThemeChanged FINAL)
     Q_PROPERTY(QColor systemAccentColor READ systemAccentColor NOTIFY systemThemeChanged FINAL)

include/FramelessHelper/Core/micamaterial.h

@@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
 class MicaMaterialPrivate;
 class FRAMELESSHELPER_CORE_API MicaMaterial : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_PUBLIC_QT_CLASS(MicaMaterial)
 
     Q_PROPERTY(QColor tintColor READ tintColor WRITE setTintColor NOTIFY tintColorChanged FINAL)

include/FramelessHelper/Core/private/chromepalette_p.h

@@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
 class ChromePalette;
 class FRAMELESSHELPER_CORE_API ChromePalettePrivate : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_PRIVATE_QT_CLASS(ChromePalette)
 
 public:

include/FramelessHelper/Core/private/framelessconfig_p.h

@@ -30,7 +30,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
 
 class FRAMELESSHELPER_CORE_API FramelessConfig : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_QT_CLASS(FramelessConfig)
 
 public:

include/FramelessHelper/Core/private/framelessmanager_p.h

@@ -36,7 +36,6 @@ using FramelessDataPtr = std::shared_ptr<FramelessData>;
 class FramelessManager;
 class FRAMELESSHELPER_CORE_API FramelessManagerPrivate : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessManager)
 
 public:

include/FramelessHelper/Core/private/micamaterial_p.h

@@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
 class MicaMaterial;
 class FRAMELESSHELPER_CORE_API MicaMaterialPrivate : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_PRIVATE_QT_CLASS(MicaMaterial)
 
 public:

include/FramelessHelper/Core/private/registrykey_p.h

@@ -60,7 +60,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
 
 class FRAMELESSHELPER_CORE_API RegistryKey : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_QT_CLASS(RegistryKey)
 
 public:

include/FramelessHelper/Core/private/sysapiloader_p.h

@@ -30,7 +30,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
 
 class FRAMELESSHELPER_CORE_API SysApiLoader : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_QT_CLASS(SysApiLoader)
 
 public:

include/FramelessHelper/Core/private/windowborderpainter_p.h

@@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
 class WindowBorderPainter;
 class FRAMELESSHELPER_CORE_API WindowBorderPainterPrivate : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_PRIVATE_QT_CLASS(WindowBorderPainter)
 
 public:

include/FramelessHelper/Core/windowborderpainter.h

@@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
 class WindowBorderPainterPrivate;
 class FRAMELESSHELPER_CORE_API WindowBorderPainter : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_PUBLIC_QT_CLASS(WindowBorderPainter)
 
     Q_PROPERTY(int thickness READ thickness WRITE setThickness NOTIFY thicknessChanged FINAL)

include/FramelessHelper/Quick/framelesshelperquick_global.h

@@ -87,7 +87,6 @@ FRAMELESSHELPER_QUICK_API void FramelessHelperQuickRegisterTypes(QQmlEngine *);
 
 class FRAMELESSHELPER_QUICK_API QuickGlobal : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_QT_CLASS(QuickGlobal)
 #ifdef QML_NAMED_ELEMENT
     QML_NAMED_ELEMENT(FramelessHelperConstants)

include/FramelessHelper/Quick/framelessquickhelper.h

@@ -41,7 +41,6 @@ class QuickWindowBorder;
 class FramelessQuickHelperPrivate;
 class FRAMELESSHELPER_QUICK_API FramelessQuickHelper : public QQuickItem
 {
-    Q_OBJECT
     FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessQuickHelper)
 #ifdef QML_NAMED_ELEMENT
     QML_NAMED_ELEMENT(FramelessHelper)

include/FramelessHelper/Quick/framelessquickutils.h

@@ -35,7 +35,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
 
 class FRAMELESSHELPER_QUICK_API FramelessQuickUtils : public QObject, public QQmlParserStatus
 {
-    Q_OBJECT
     FRAMELESSHELPER_QT_CLASS(FramelessQuickUtils)
     Q_INTERFACES(QQmlParserStatus)
 #ifdef QML_NAMED_ELEMENT

include/FramelessHelper/Quick/private/framelessquickapplicationwindow_p.h

@@ -36,7 +36,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
 class FramelessQuickApplicationWindowPrivate;
 class FRAMELESSHELPER_QUICK_API FramelessQuickApplicationWindow : public QQuickApplicationWindow
 {
-    Q_OBJECT
     FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessQuickApplicationWindow)
 #ifdef QML_NAMED_ELEMENT
     QML_NAMED_ELEMENT(FramelessApplicationWindow)

include/FramelessHelper/Quick/private/framelessquickapplicationwindow_p_p.h

@@ -39,7 +39,6 @@ class QuickWindowBorder;
 class FramelessQuickApplicationWindow;
 class FRAMELESSHELPER_QUICK_API FramelessQuickApplicationWindowPrivate : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessQuickApplicationWindow)
 
 public:

include/FramelessHelper/Quick/private/framelessquickhelper_p.h

@@ -44,7 +44,6 @@ class QuickWindowBorder;
 class FramelessQuickHelper;
 class FRAMELESSHELPER_QUICK_API FramelessQuickHelperPrivate : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessQuickHelper)
 
 public:

include/FramelessHelper/Quick/private/framelessquickwindow_p.h

@@ -36,7 +36,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
 class FramelessQuickWindowPrivate;
 class FRAMELESSHELPER_QUICK_API FramelessQuickWindow : public QQuickWindowQmlImpl
 {
-    Q_OBJECT
     FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessQuickWindow)
 #ifdef QML_NAMED_ELEMENT
     QML_NAMED_ELEMENT(FramelessWindow)

include/FramelessHelper/Quick/private/framelessquickwindow_p_p.h

@@ -39,7 +39,6 @@ class QuickWindowBorder;
 class FramelessQuickWindow;
 class FRAMELESSHELPER_QUICK_API FramelessQuickWindowPrivate : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessQuickWindow)
 
 public:

include/FramelessHelper/Quick/private/quickimageitem_p.h

@@ -32,7 +32,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
 
 class FRAMELESSHELPER_QUICK_API QuickImageItem : public QQuickPaintedItem
 {
-    Q_OBJECT
     FRAMELESSHELPER_QT_CLASS(QuickImageItem)
 #ifdef QML_NAMED_ELEMENT
     QML_NAMED_ELEMENT(ImageItem)

include/FramelessHelper/Quick/private/quickmicamaterial_p.h

@@ -35,7 +35,6 @@ class MicaMaterial;
 class QuickMicaMaterial;
 class FRAMELESSHELPER_QUICK_API QuickMicaMaterialPrivate : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_PRIVATE_QT_CLASS(QuickMicaMaterial)
 
 public:

include/FramelessHelper/Quick/private/quickstandardsystembutton_p.h

@@ -39,7 +39,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
 
 class FRAMELESSHELPER_QUICK_API QuickStandardSystemButton : public QQuickButton
 {
-    Q_OBJECT
     FRAMELESSHELPER_QT_CLASS(QuickStandardSystemButton)
 #ifdef QML_NAMED_ELEMENT
     QML_NAMED_ELEMENT(StandardSystemButton)

include/FramelessHelper/Quick/private/quickstandardtitlebar_p.h

@@ -45,7 +45,6 @@ class QuickImageItem;
 
 class FRAMELESSHELPER_QUICK_API QuickStandardTitleBar : public QQuickRectangle
 {
-    Q_OBJECT
     FRAMELESSHELPER_QT_CLASS(QuickStandardTitleBar)
 #ifdef QML_NAMED_ELEMENT
     QML_NAMED_ELEMENT(StandardTitleBar)

include/FramelessHelper/Quick/private/quickwindowborder_p.h

@@ -35,7 +35,6 @@ class WindowBorderPainter;
 class QuickWindowBorder;
 class FRAMELESSHELPER_QUICK_API QuickWindowBorderPrivate : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_PRIVATE_QT_CLASS(QuickWindowBorder)
 
 public:

include/FramelessHelper/Quick/quickchromepalette.h

@@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
 
 class FRAMELESSHELPER_QUICK_API QuickChromePalette : public ChromePalette, public QQmlParserStatus
 {
-    Q_OBJECT
     FRAMELESSHELPER_QT_CLASS(QuickChromePalette)
     Q_INTERFACES(QQmlParserStatus)
 #ifdef QML_ANONYMOUS

include/FramelessHelper/Quick/quickmicamaterial.h

@@ -35,7 +35,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
 class QuickMicaMaterialPrivate;
 class FRAMELESSHELPER_QUICK_API QuickMicaMaterial : public QQuickPaintedItem
 {
-    Q_OBJECT
     FRAMELESSHELPER_PUBLIC_QT_CLASS(QuickMicaMaterial)
 #ifdef QML_NAMED_ELEMENT
     QML_NAMED_ELEMENT(MicaMaterial)

include/FramelessHelper/Quick/quickwindowborder.h

@@ -35,7 +35,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
 class QuickWindowBorderPrivate;
 class FRAMELESSHELPER_QUICK_API QuickWindowBorder : public QQuickPaintedItem
 {
-    Q_OBJECT
     FRAMELESSHELPER_PUBLIC_QT_CLASS(QuickWindowBorder)
 #ifdef QML_NAMED_ELEMENT
     QML_NAMED_ELEMENT(WindowBorder)

include/FramelessHelper/Widgets/framelessdialog.h

@@ -35,7 +35,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
 class FramelessDialogPrivate;
 class FRAMELESSHELPER_WIDGETS_API FramelessDialog : public QDialog
 {
-    Q_OBJECT
     FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessDialog)
 
 public:

include/FramelessHelper/Widgets/framelessmainwindow.h

@@ -35,7 +35,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
 class FramelessMainWindowPrivate;
 class FRAMELESSHELPER_WIDGETS_API FramelessMainWindow : public QMainWindow
 {
-    Q_OBJECT
     FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessMainWindow)
     Q_PROPERTY(bool hidden READ isHidden NOTIFY hiddenChanged FINAL)
     Q_PROPERTY(bool normal READ isNormal NOTIFY normalChanged FINAL)

include/FramelessHelper/Widgets/framelesswidget.h

@@ -35,7 +35,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
 class FramelessWidgetPrivate;
 class FRAMELESSHELPER_WIDGETS_API FramelessWidget : public QWidget
 {
-    Q_OBJECT
     FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessWidget)
     Q_PROPERTY(bool hidden READ isHidden NOTIFY hiddenChanged FINAL)
     Q_PROPERTY(bool normal READ isNormal NOTIFY normalChanged FINAL)

include/FramelessHelper/Widgets/framelesswidgetshelper.h

@@ -40,7 +40,6 @@ class WindowBorderPainter;
 class FramelessWidgetsHelperPrivate;
 class FRAMELESSHELPER_WIDGETS_API FramelessWidgetsHelper : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessWidgetsHelper)
     Q_PROPERTY(QWidget* titleBarWidget READ titleBarWidget WRITE setTitleBarWidget NOTIFY titleBarWidgetChanged FINAL)
     Q_PROPERTY(bool windowFixedSize READ isWindowFixedSize WRITE setWindowFixedSize NOTIFY windowFixedSizeChanged FINAL)

include/FramelessHelper/Widgets/private/framelessdialog_p.h

@@ -35,7 +35,6 @@ class WidgetsSharedHelper;
 class FramelessDialog;
 class FRAMELESSHELPER_WIDGETS_API FramelessDialogPrivate : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessDialog)
 
 public:

include/FramelessHelper/Widgets/private/framelessmainwindow_p.h

@@ -35,7 +35,6 @@ class WidgetsSharedHelper;
 class FramelessMainWindow;
 class FRAMELESSHELPER_WIDGETS_API FramelessMainWindowPrivate : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessMainWindow)
 
 public:

include/FramelessHelper/Widgets/private/framelesswidget_p.h

@@ -35,7 +35,6 @@ class WidgetsSharedHelper;
 class FramelessWidget;
 class FRAMELESSHELPER_WIDGETS_API FramelessWidgetPrivate : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessWidget)
 
 public:

include/FramelessHelper/Widgets/private/framelesswidgetshelper_p.h

@@ -42,7 +42,6 @@ class WidgetsSharedHelper;
 class FramelessWidgetsHelper;
 class FRAMELESSHELPER_WIDGETS_API FramelessWidgetsHelperPrivate : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessWidgetsHelper)
 
 public:

include/FramelessHelper/Widgets/private/standardsystembutton_p.h

@@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
 class StandardSystemButton;
 class FRAMELESSHELPER_WIDGETS_API StandardSystemButtonPrivate : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_PRIVATE_QT_CLASS(StandardSystemButton)
 
 public:

include/FramelessHelper/Widgets/private/standardtitlebar_p.h

@@ -44,7 +44,6 @@ class ChromePalette;
 class StandardTitleBar;
 class FRAMELESSHELPER_WIDGETS_API StandardTitleBarPrivate : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_PRIVATE_QT_CLASS(StandardTitleBar)
 
 public:

include/FramelessHelper/Widgets/private/widgetssharedhelper_p.h

@@ -38,7 +38,6 @@ class WindowBorderPainter;
 
 class FRAMELESSHELPER_WIDGETS_API WidgetsSharedHelper : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_QT_CLASS(WidgetsSharedHelper)
 #if FRAMELESSHELPER_CONFIG(mica_material)
     Q_PROPERTY(bool micaEnabled READ isMicaEnabled WRITE setMicaEnabled NOTIFY micaEnabledChanged FINAL)

include/FramelessHelper/Widgets/standardsystembutton.h

@@ -35,7 +35,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
 class StandardSystemButtonPrivate;
 class FRAMELESSHELPER_WIDGETS_API StandardSystemButton : public QPushButton
 {
-    Q_OBJECT
     FRAMELESSHELPER_PUBLIC_QT_CLASS(StandardSystemButton)
     Q_PROPERTY(Global::SystemButtonType buttonType READ buttonType WRITE setButtonType NOTIFY buttonTypeChanged FINAL)
     Q_PROPERTY(QString glyph READ glyph WRITE setGlyph NOTIFY glyphChanged FINAL)

include/FramelessHelper/Widgets/standardtitlebar.h

@@ -40,7 +40,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
 class StandardTitleBarPrivate;
 class FRAMELESSHELPER_WIDGETS_API StandardTitleBar : public QWidget
 {
-    Q_OBJECT
     FRAMELESSHELPER_PUBLIC_QT_CLASS(StandardTitleBar)
     Q_PROPERTY(Qt::Alignment titleLabelAlignment READ titleLabelAlignment WRITE setTitleLabelAlignment NOTIFY titleLabelAlignmentChanged FINAL)
 #if (!defined(Q_OS_MACOS) && FRAMELESSHELPER_CONFIG(system_button))

src/core/CMakeLists.txt

@@ -281,6 +281,7 @@ if(NOT FRAMELESSHELPER_BUILD_STATIC)
 endif()
 
 setup_qt_stuff(TARGETS ${SUB_MODULE_TARGET})
+setup_custom_moc_macros(TARGETS ${SUB_MODULE_TARGET})
 
 set(__extra_flags "")
 if(NOT FRAMELESSHELPER_NO_PERMISSIVE_CHECKS)

src/core/framelesshelper_win.cpp

@@ -843,23 +843,53 @@ bool FramelessHelperWin::nativeEventFilter(const QByteArray &eventType, void *me
         const auto clientHeight = RECT_HEIGHT(clientRect);
 
         const QPoint qtScenePos = Utils::fromNativeLocalPosition(qWindow, QPoint(nativeLocalPos.x, nativeLocalPos.y));
+
+        const bool isFixedSize = data->callbacks->isWindowFixedSize();
+        const bool isTitleBar = data->callbacks->isInsideTitleBarDraggableArea(qtScenePos);
+        const bool dontOverrideCursor = data->callbacks->getProperty(kDontOverrideCursorVar, false).toBool();
+        const bool dontToggleMaximize = data->callbacks->getProperty(kDontToggleMaximizeVar, false).toBool();
+
+        if (dontToggleMaximize) {
+            static bool warnedOnce = false;
+            if (!warnedOnce) {
+                warnedOnce = true;
+                DEBUG << "To disable window maximization, you should remove the "
+                         "WS_MAXIMIZEBOX style from the window instead. FramelessHelper "
+                         "won't do that for you, so you'll have to do it manually yourself.";
+            }
+        }
+
         SystemButtonType sysButtonType = SystemButtonType::Unknown;
-        if (data->callbacks->isInsideSystemButtons(qtScenePos, &sysButtonType)) {
+        if (!isFixedSize && data->callbacks->isInsideSystemButtons(qtScenePos, &sysButtonType)) {
+            // Firstly, we set the hit test result to a default value to be able to detect whether we
+            // have changed it or not afterwards.
+            *result = HTNOWHERE;
             // Even if the mouse is inside the chrome button area now, we should still allow the user
             // to be able to resize the window with the top or right window border, this is also the
-            // normal behavior of a native Win32 window.
+            // normal behavior of a native Win32 window (but only when the window is not maximized/
-            static constexpr const int kBorderSize = 2;
+            // fullscreened/minimized, of course).
-            const bool isTop = (nativeLocalPos.y <= kBorderSize);
+            if (Utils::isWindowNoState(windowId)) {
-            const bool isRight = (nativeLocalPos.x >= (clientWidth - kBorderSize));
+                static constexpr const int kBorderSize = 2;
-            if (isTop || isRight) {
+                const bool isTop = (nativeLocalPos.y <= kBorderSize);
-                if (isTop && isRight) {
+                const bool isRight = (nativeLocalPos.x >= (clientWidth - kBorderSize));
-                    *result = HTTOPRIGHT;
+                if (isTop || isRight) {
-                } else if (isTop) {
+                    if (dontOverrideCursor) {
-                    *result = HTTOP;
+                        // The user doesn't want the window to be resized, so we tell Windows we are
-                } else {
+                        // in the client area so that the controls beneath the mouse cursor can still
-                    *result = HTRIGHT;
+                        // be hovered or clicked.
+                        *result = (isTitleBar ? HTCAPTION : HTCLIENT);
+                    } else {
+                        if (isTop && isRight) {
+                            *result = HTTOPRIGHT;
+                        } else if (isTop) {
+                            *result = HTTOP;
+                        } else {
+                            *result = HTRIGHT;
+                        }
+                    }
                 }
-            } else {
+            }
+            if (*result == HTNOWHERE) {
                 // OK, we are now really inside one of the chrome buttons, tell Windows the exact role of our button.
                 // The Snap Layout feature introduced in Windows 11 won't work without this.
                 switch (sysButtonType) {
@@ -880,10 +910,14 @@ bool FramelessHelperWin::nativeEventFilter(const QByteArray &eventType, void *me
                     *result = HTCLOSE;
                     break;
                 case SystemButtonType::Unknown:
-                    *result = HTCLIENT; // Normally we'd never enter this branch.
                     break;
                 }
             }
+            if (*result == HTNOWHERE) {
+                // OK, it seems we are not inside the window resize area, nor inside the chrome buttons,
+                // tell Windows we are in the client area to let Qt handle this event.
+                *result = HTCLIENT;
+            }
             return true;
         }
         // OK, we are not inside of any chrome buttons, try to find out which part of the window
@@ -893,26 +927,16 @@ bool FramelessHelperWin::nativeEventFilter(const QByteArray &eventType, void *me
         const bool full = Utils::isFullScreen(windowId);
         const int frameSizeY = Utils::getResizeBorderThickness(windowId, false, true);
         const bool isTop = (nativeLocalPos.y < frameSizeY);
-        const bool isTitleBar = data->callbacks->isInsideTitleBarDraggableArea(qtScenePos);
-        const bool isFixedSize = data->callbacks->isWindowFixedSize();
-        const bool dontOverrideCursor = data->callbacks->getProperty(kDontOverrideCursorVar, false).toBool();
-        const bool dontToggleMaximize = data->callbacks->getProperty(kDontToggleMaximizeVar, false).toBool();
-
-        if (dontToggleMaximize) {
-            static bool once = false;
-            if (!once) {
-                once = true;
-                DEBUG << "To disable window maximization, you should remove the "
-                         "WS_MAXIMIZEBOX style from the window instead. FramelessHelper "
-                         "won't do that for you, so you'll have to do it manually yourself.";
-            }
-        }
 
         if (frameBorderVisible) {
             // This will handle the left, right and bottom parts of the frame
             // because we didn't change them.
             const LRESULT originalHitTestResult = ::DefWindowProcW(hWnd, WM_NCHITTEST, 0, lParam);
             if (originalHitTestResult != HTCLIENT) {
+                // Even if the window is not resizable, we still can't return HTCLIENT here because
+                // when we enters this code path, it means the mouse cursor is outside of the window,
+                // that is, the three transparent window resize area. Returning HTCLIENT will confuse
+                // Windows and we can't put our controls there anyway.
                 *result = ((isFixedSize || dontOverrideCursor) ? HTBORDER : originalHitTestResult);
                 return true;
             }
@@ -933,7 +957,7 @@ bool FramelessHelperWin::nativeEventFilter(const QByteArray &eventType, void *me
                 // Return HTCLIENT instead of HTBORDER here, because the mouse is
                 // inside our homemade title bar now, return HTCLIENT to let our
                 // title bar can still capture mouse events.
-                *result = ((isFixedSize || dontOverrideCursor) ? HTCLIENT : HTTOP);
+                *result = ((isFixedSize || dontOverrideCursor) ? (isTitleBar ? HTCAPTION : HTCLIENT) : HTTOP);
                 return true;
             }
             if (isTitleBar) {
@@ -962,7 +986,7 @@ bool FramelessHelperWin::nativeEventFilter(const QByteArray &eventType, void *me
                     // Return HTCLIENT instead of HTBORDER here, because the mouse is
                     // inside the window now, return HTCLIENT to let the controls
                     // inside our window can still capture mouse events.
-                    *result = HTCLIENT;
+                    *result = (isTitleBar ? HTCAPTION : HTCLIENT);
                     return true;
                 }
                 if (isTop) {

src/core/framelessmanager.cpp

@@ -45,7 +45,6 @@
 #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>
@@ -108,7 +107,6 @@ Q_GLOBAL_STATIC(InternalData, g_internalData)
 
 class InternalEventFilter : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_QT_CLASS(InternalEventFilter)
 
 public:

src/core/micamaterial.cpp

@@ -492,7 +492,6 @@ static inline void expblur(QImage &img, qreal radius, const bool improvedQuality
 
 class WallpaperThread : public FramelessHelperThreadClass
 {
-    Q_OBJECT
     FRAMELESSHELPER_QT_CLASS(WallpaperThread)
 
 public:

src/core/utils_mac.mm

@@ -222,7 +222,6 @@ private:
 
 class NSWindowProxy : public QObject
 {
-    Q_OBJECT
     FRAMELESSHELPER_QT_CLASS(NSWindowProxy)
 
 public:

src/quick/CMakeLists.txt

@@ -261,6 +261,7 @@ if(NOT FRAMELESSHELPER_BUILD_STATIC)
 endif()
 
 setup_qt_stuff(TARGETS ${SUB_MODULE_TARGET} ALLOW_KEYWORD)
+setup_custom_moc_macros(TARGETS ${SUB_MODULE_TARGET})
 
 set(__extra_flags "")
 if(NOT FRAMELESSHELPER_NO_PERMISSIVE_CHECKS)

src/quick/framelessquickhelper.cpp

@@ -594,7 +594,10 @@ bool FramelessQuickHelperPrivate::shouldIgnoreMouseEvents(const QPoint &pos) con
     if (!window) {
         return false;
     }
-    const auto withinFrameBorder = [&pos, window]() -> bool {
+    const auto withinFrameBorder = [q, &pos, window]() -> bool {
+        if (q->isWindowFixedSize()) {
+            return false;
+        }
         if (pos.y() < kDefaultResizeBorderThickness) {
             return true;
         }

src/widgets/CMakeLists.txt

@@ -153,6 +153,7 @@ if(NOT FRAMELESSHELPER_BUILD_STATIC)
 endif()
 
 setup_qt_stuff(TARGETS ${SUB_MODULE_TARGET})
+setup_custom_moc_macros(TARGETS ${SUB_MODULE_TARGET})
 
 set(__extra_flags "")
 if(NOT FRAMELESSHELPER_NO_PERMISSIVE_CHECKS)

src/widgets/framelesswidgetshelper.cpp

@@ -655,6 +655,9 @@ bool FramelessWidgetsHelperPrivate::shouldIgnoreMouseEvents(const QPoint &pos) c
         return false;
     }
     const auto withinFrameBorder = [this, &pos]() -> bool {
+        if (isWidgetFixedSize(window)) {
+            return false;
+        }
         if (pos.y() < kDefaultResizeBorderThickness) {
             return true;
         }