common: improve robustness

Signed-off-by: Yuhang Zhao <[email protected]>
wangwenx190 · May 20, 2022 · 5754f2e · 5754f2e
1 parent 44b3730
commit 5754f2e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 16 deletions.
diff --git a/include/FramelessHelper/Quick/framelessquickhelper.h b/include/FramelessHelper/Quick/framelessquickhelper.h
@@ -56,7 +56,7 @@ public Q_SLOTS:
 
     void setTitleBarItem(QQuickItem *value);
     void setSystemButton(QQuickItem *item, const QuickGlobal::SystemButtonType buttonType);
-    void setHitTestVisible(QQuickItem *item);
+    void setHitTestVisible(QQuickItem *item, const bool visible = true);
 
     void showSystemMenu(const QPoint &pos);
     void windowStartSystemMove2(const QPoint &pos);

diff --git a/include/FramelessHelper/Quick/private/framelessquickhelper_p.h b/include/FramelessHelper/Quick/private/framelessquickhelper_p.h
@@ -54,7 +54,7 @@ class FRAMELESSHELPER_QUICK_API FramelessQuickHelperPrivate : public QObject
 
     void attachToWindow();
     void setSystemButton(QQuickItem *item, const QuickGlobal::SystemButtonType buttonType);
-    void setHitTestVisible(QQuickItem *item);
+    void setHitTestVisible(QQuickItem *item, const bool visible = true);
     void showSystemMenu(const QPoint &pos);
     void windowStartSystemMove2(const QPoint &pos);
     void windowStartSystemResize2(const Qt::Edges edges, const QPoint &pos);

diff --git a/include/FramelessHelper/Widgets/framelesswidgetshelper.h b/include/FramelessHelper/Widgets/framelesswidgetshelper.h
@@ -52,7 +52,7 @@ public Q_SLOTS:
 
     void setTitleBarWidget(QWidget *widget);
     void setSystemButton(QWidget *widget, const Global::SystemButtonType buttonType);
-    void setHitTestVisible(QWidget *widget);
+    void setHitTestVisible(QWidget *widget, const bool visible = true);
 
     void showSystemMenu(const QPoint &pos);
     void windowStartSystemMove2(const QPoint &pos);

diff --git a/include/FramelessHelper/Widgets/private/framelesswidgetshelper_p.h b/include/FramelessHelper/Widgets/private/framelesswidgetshelper_p.h
@@ -50,7 +50,7 @@ class FRAMELESSHELPER_WIDGETS_API FramelessWidgetsHelperPrivate : public QObject
 
     void attachToWindow();
     void setSystemButton(QWidget *widget, const Global::SystemButtonType buttonType);
-    void setHitTestVisible(QWidget *widget);
+    void setHitTestVisible(QWidget *widget, const bool visible = true);
     void showSystemMenu(const QPoint &pos);
     void windowStartSystemMove2(const QPoint &pos);
     void windowStartSystemResize2(const Qt::Edges edges, const QPoint &pos);

diff --git a/src/quick/framelessquickhelper.cpp b/src/quick/framelessquickhelper.cpp
@@ -46,7 +46,7 @@ struct QuickHelperData
     bool attached = false;
     SystemParameters params = {};
     QPointer<QQuickItem> titleBarItem = nullptr;
-    QList<QQuickItem *> hitTestVisibleItems = {};
+    QList<QPointer<QQuickItem>> hitTestVisibleItems = {};
     QPointer<QQuickItem> windowIconButton = nullptr;
     QPointer<QQuickItem> contextHelpButton = nullptr;
     QPointer<QQuickItem> minimizeButton = nullptr;
@@ -223,7 +223,7 @@ void FramelessQuickHelperPrivate::setSystemButton(QQuickItem *item, const QuickG
     }
 }
 
-void FramelessQuickHelperPrivate::setHitTestVisible(QQuickItem *item)
+void FramelessQuickHelperPrivate::setHitTestVisible(QQuickItem *item, const bool visible)
 {
     Q_ASSERT(item);
     if (!item) {
@@ -234,12 +234,11 @@ void FramelessQuickHelperPrivate::setHitTestVisible(QQuickItem *item)
     if (!data) {
         return;
     }
-    static constexpr const bool visible = true;
     const bool exists = data->hitTestVisibleItems.contains(item);
     if (visible && !exists) {
         data->hitTestVisibleItems.append(item);
     }
-    if constexpr (!visible && exists) {
+    if (!visible && exists) {
         data->hitTestVisibleItems.removeAll(item);
     }
 }
@@ -672,14 +671,14 @@ void FramelessQuickHelper::setSystemButton(QQuickItem *item, const QuickGlobal::
     d->setSystemButton(item, buttonType);
 }
 
-void FramelessQuickHelper::setHitTestVisible(QQuickItem *item)
+void FramelessQuickHelper::setHitTestVisible(QQuickItem *item, const bool visible)
 {
     Q_ASSERT(item);
     if (!item) {
         return;
     }
     Q_D(FramelessQuickHelper);
-    d->setHitTestVisible(item);
+    d->setHitTestVisible(item, visible);
 }
 
 void FramelessQuickHelper::showSystemMenu(const QPoint &pos)

diff --git a/src/widgets/framelesswidgetshelper.cpp b/src/widgets/framelesswidgetshelper.cpp
@@ -43,7 +43,7 @@ struct WidgetsHelperData
     bool attached = false;
     SystemParameters params = {};
     QPointer<QWidget> titleBarWidget = nullptr;
-    QWidgetList hitTestVisibleWidgets = {};
+    QList<QPointer<QWidget>> hitTestVisibleWidgets = {};
     QPointer<QWidget> windowIconButton = nullptr;
     QPointer<QWidget> contextHelpButton = nullptr;
     QPointer<QWidget> minimizeButton = nullptr;
@@ -170,7 +170,7 @@ QWidget *FramelessWidgetsHelperPrivate::getTitleBarWidget() const
     return getWindowData().titleBarWidget;
 }
 
-void FramelessWidgetsHelperPrivate::setHitTestVisible(QWidget *widget)
+void FramelessWidgetsHelperPrivate::setHitTestVisible(QWidget *widget, const bool visible)
 {
     Q_ASSERT(widget);
     if (!widget) {
@@ -181,12 +181,11 @@ void FramelessWidgetsHelperPrivate::setHitTestVisible(QWidget *widget)
     if (!data) {
         return;
     }
-    static constexpr const bool visible = true;
     const bool exists = data->hitTestVisibleWidgets.contains(widget);
     if (visible && !exists) {
         data->hitTestVisibleWidgets.append(widget);
     }
-    if constexpr (!visible && exists) {
+    if (!visible && exists) {
         data->hitTestVisibleWidgets.removeAll(widget);
     }
 }
@@ -665,14 +664,14 @@ void FramelessWidgetsHelper::setSystemButton(QWidget *widget, const SystemButton
     d->setSystemButton(widget, buttonType);
 }
 
-void FramelessWidgetsHelper::setHitTestVisible(QWidget *widget)
+void FramelessWidgetsHelper::setHitTestVisible(QWidget *widget, const bool visible)
 {
     Q_ASSERT(widget);
     if (!widget) {
         return;
     }
     Q_D(FramelessWidgetsHelper);
-    d->setHitTestVisible(widget);
+    d->setHitTestVisible(widget, visible);
 }
 
 void FramelessWidgetsHelper::showSystemMenu(const QPoint &pos)