From e9d163b1a811ee4f02e898bc7c2e6336d88e4a7f Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周日, 28 7月 2024 18:09:03 +0800
Subject: [PATCH] Make hit-test items auto-delete
---
src/core/contexts/abstractwindowcontext_p.h | 113 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 95 insertions(+), 18 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index a7b6767..062494d 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -1,33 +1,53 @@
+// Copyright (C) 2023-2024 Stdware Collections (https://www.github.com/stdware)
+// Copyright (C) 2021-2023 wangwenx190 (Yuhang Zhao)
+// SPDX-License-Identifier: Apache-2.0
+
#ifndef ABSTRACTWINDOWCONTEXT_P_H
#define ABSTRACTWINDOWCONTEXT_P_H
+
+//
+// W A R N I N G !!!
+// -----------------
+//
+// This file is not part of the QWindowKit API. It is used purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or may even be removed.
+//
#include <array>
#include <memory>
#include <QtCore/QSet>
+#include <QtCore/QPointer>
+#include <QtGui/QRegion>
#include <QtGui/QWindow>
-#include <QtGui/QPolygon>
#include <QWKCore/windowagentbase.h>
+#include <QWKCore/private/nativeeventfilter_p.h>
+#include <QWKCore/private/sharedeventfilter_p.h>
#include <QWKCore/private/windowitemdelegate_p.h>
+#include <QWKCore/private/winidchangeeventfilter_p.h>
namespace QWK {
- class QWK_CORE_EXPORT AbstractWindowContext : public QObject {
+ class QWK_CORE_EXPORT AbstractWindowContext : public QObject,
+ public NativeEventDispatcher,
+ public SharedEventDispatcher {
Q_OBJECT
public:
AbstractWindowContext();
~AbstractWindowContext() override;
public:
- bool setup(QObject *host, WindowItemDelegate *delegate);
+ void setup(QObject *host, WindowItemDelegate *delegate);
inline QObject *host() const;
inline QWindow *window() const;
+ inline WId windowId() const;
+ inline WindowItemDelegate *delegate() const;
inline bool isHitTestVisible(const QObject *obj) const;
- bool setHitTestVisible(const QObject *obj, bool visible);
- bool setHitTestVisible(const QRect &rect, bool visible);
+ bool setHitTestVisible(QObject *obj, bool visible);
inline QObject *systemButton(WindowAgentBase::SystemButton button) const;
bool setSystemButton(WindowAgentBase::SystemButton button, QObject *obj);
@@ -35,39 +55,82 @@
inline QObject *titleBar() const;
bool setTitleBar(QObject *obj);
- void showSystemMenu(const QPoint &pos);
+#ifdef Q_OS_MAC
+ inline ScreenRectCallback systemButtonAreaCallback() const;
+ void setSystemButtonAreaCallback(const ScreenRectCallback &callback);
+#endif
- QRegion hitTestShape() const;
bool isInSystemButtons(const QPoint &pos, WindowAgentBase::SystemButton *button) const;
bool isInTitleBarDraggableArea(const QPoint &pos) const;
+
+ inline bool isHostWidthFixed() const {
+ return m_windowHandle
+ ? ((m_windowHandle->flags() & Qt::MSWindowsFixedSizeDialogHint) ||
+ m_windowHandle->minimumWidth() == m_windowHandle->maximumWidth())
+ : false;
+ }
+ inline bool isHostHeightFixed() const {
+ return m_windowHandle
+ ? ((m_windowHandle->flags() & Qt::MSWindowsFixedSizeDialogHint) ||
+ m_windowHandle->minimumHeight() == m_windowHandle->maximumHeight())
+ : false;
+ }
+ inline bool isHostSizeFixed() const {
+ return m_windowHandle ? ((m_windowHandle->flags() & Qt::MSWindowsFixedSizeDialogHint) ||
+ m_windowHandle->minimumSize() == m_windowHandle->maximumSize())
+ : false;
+ }
virtual QString key() const;
enum WindowContextHook {
CentralizeHook = 1,
+ RaiseWindowHook,
ShowSystemMenuHook,
- NeedsDrawBordersHook,
- DrawBordersHook,
+ DefaultColorsHook,
+ DrawWindows10BorderHook, // Only works on Windows 10, emulated workaround
+ DrawWindows10BorderHook2, // Only works on Windows 10, native workaround
+ SystemButtonAreaChangedHook, // Only works on Mac
};
virtual void virtual_hook(int id, void *data);
- protected:
- virtual bool setupHost() = 0;
+ void showSystemMenu(const QPoint &pos);
+ void notifyWinIdChange();
+
+ virtual QVariant windowAttribute(const QString &key) const;
+ virtual bool setWindowAttribute(const QString &key, const QVariant &attribute);
protected:
- QObject *m_host;
+ bool eventFilter(QObject *obj, QEvent *event) override;
+
+ protected:
+ virtual void winIdChanged(WId winId, WId oldWinId) = 0;
+ virtual bool windowAttributeChanged(const QString &key, const QVariant &attribute,
+ const QVariant &oldAttribute);
+
+ protected:
+ QObject *m_host{};
std::unique_ptr<WindowItemDelegate> m_delegate;
- QWindow *m_windowHandle;
+ QPointer<QWindow> m_windowHandle;
+ WId m_windowId{};
QSet<const QObject *> m_hitTestVisibleItems;
- QList<QRect> m_hitTestVisibleRects;
+#ifdef Q_OS_MAC
+ ScreenRectCallback m_systemButtonAreaCallback;
+#endif
QObject *m_titleBar{};
- std::array<QObject *, WindowAgentBase::NumSystemButton> m_systemButtons{};
+ std::array<QObject *, WindowAgentBase::Close + 1> m_systemButtons{};
- // Cached shape
- mutable bool hitTestVisibleShapeDirty{};
- mutable QRegion hitTestVisibleShape;
+ QVariantHash m_windowAttributes;
+ std::unique_ptr<WinIdChangeEventFilter> m_winIdChangeEventFilter;
+
+ void removeSystemButtonsAndHitTestItems();
+
+ private:
+ void _q_titleBarDistroyed(QObject *obj);
+ void _q_hitTestVisibleItemDestroyed(QObject *obj);
+ void _q_systemButtonDestroyed(QObject *obj);
};
inline QObject *AbstractWindowContext::host() const {
@@ -76,6 +139,14 @@
inline QWindow *AbstractWindowContext::window() const {
return m_windowHandle;
+ }
+
+ inline WId AbstractWindowContext::windowId() const {
+ return m_windowId;
+ }
+
+ inline WindowItemDelegate *AbstractWindowContext::delegate() const {
+ return m_delegate.get();
}
inline bool AbstractWindowContext::isHitTestVisible(const QObject *obj) const {
@@ -91,6 +162,12 @@
return m_titleBar;
}
+#ifdef Q_OS_MAC
+ inline ScreenRectCallback AbstractWindowContext::systemButtonAreaCallback() const {
+ return m_systemButtonAreaCallback;
+ }
+#endif
+
}
#endif // ABSTRACTWINDOWCONTEXT_P_H
--
Gitblit v1.9.1