Add object helper

Author: SineStriker

src/core/qwkglobal_p.h

@@ -10,6 +10,7 @@
 // version without notice, or may even be removed.
 //
 
+#include <QtCore/QObject>
 #include <QtCore/QLoggingCategory>
 #include <QtGui/QMouseEvent>
 
@@ -42,22 +43,32 @@ QWK_CORE_EXPORT Q_DECLARE_LOGGING_CATEGORY(qWindowKitLog)
 
 namespace QWK {
 
+    namespace Private {
+
+        class ObjectHelper : public QObject {
+        public:
+            static inline bool sendEvent(QObject *obj, QEvent *event) {
+                return static_cast<ObjectHelper *>(obj)->event(event);
+            }
+        };
+
+    }
+
     inline QPoint getMouseEventScenePos(const QMouseEvent *event) {
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
         return event->scenePosition().toPoint();
 #else
         return event->windowPos().toPoint();
 #endif
     }
-    
+
     inline QPoint getMouseEventGlobalPos(const QMouseEvent *event) {
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
         return event->globalPosition().toPoint();
 #else
         return event->screenPos().toPoint();
 #endif
     }
-    
 }
 
 #endif // QWKGLOBAL_P_H

src/quick/quickwindowagent.h

@@ -31,8 +31,8 @@ namespace QWK {
         Q_INVOKABLE void setHitTestVisible(const QQuickItem *item, bool visible = true);
 
 #ifdef Q_OS_MAC
-        QQuickItem *systemButtonArea() const;
-        void setSystemButtonArea(QQuickItem *item);
+        Q_INVOKABLE QQuickItem *systemButtonArea() const;
+        Q_INVOKABLE void setSystemButtonArea(QQuickItem *item);
 #endif
 
     Q_SIGNALS:

src/widgets/widgetwindowagent_win.cpp

@@ -5,6 +5,7 @@
 #include <QtGui/QPainter>
 
 #include <QWKCore/qwindowkit_windows.h>
+#include <QWKCore/private/qwkglobal_p.h>
 
 namespace QWK {
 
@@ -68,14 +69,8 @@ namespace QWK {
         }
 
         inline void resumeWidgetEventAndDraw(QWidget *w, QEvent *event) {
-            // Friend class helping to call `event`
-            class HackedWidget : public QWidget {
-            public:
-                friend class QWK::WidgetBorderHandler;
-            };
-
             // Let the widget paint first
-            static_cast<HackedWidget *>(w)->event(event);
+            Private::ObjectHelper::sendEvent(w, event);
 
             // Due to the timer or user action, Qt will repaint some regions spontaneously,
             // even if there is no WM_PAINT message, we must wait for it to finish painting
@@ -84,14 +79,8 @@ namespace QWK {
         }
 
         inline void resumeWindowEventAndDraw(QWindow *window, QEvent *event) {
-            // Friend class helping to call `event`
-            class HackedWindow : public QWindow {
-            public:
-                friend class QWK::WidgetBorderHandler;
-            };
-
             // Let Qt paint first
-            static_cast<HackedWindow *>(window)->event(event);
+            Private::ObjectHelper::sendEvent(window, event);
 
             // Upon receiving the WM_PAINT message, Qt will repaint the entire view, and we
             // must wait for it to finish painting before drawing this top border area.