From 76924a335f40a0c3cc13805b4cb9429c336d33ca Mon Sep 17 00:00:00 2001
From: SineStriker <trueful@163.com>
Date: 周五, 29 12月 2023 11:34:22 +0800
Subject: [PATCH] Optimize system button area APIs
---
src/core/contexts/abstractwindowcontext_p.h | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index 3938d75..f375b83 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -1,6 +1,15 @@
#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>
@@ -11,11 +20,14 @@
#include <QWKCore/windowagentbase.h>
#include <QWKCore/private/nativeeventfilter_p.h>
+#include <QWKCore/private/sharedeventfilter_p.h>
#include <QWKCore/private/windowitemdelegate_p.h>
namespace QWK {
- class QWK_CORE_EXPORT AbstractWindowContext : public QObject, public NativeEventDispatcher {
+ class QWK_CORE_EXPORT AbstractWindowContext : public QObject,
+ public NativeEventDispatcher,
+ public SharedEventDispatcher {
Q_OBJECT
public:
AbstractWindowContext();
@@ -38,8 +50,8 @@
bool setTitleBar(QObject *obj);
#ifdef Q_OS_MAC
- inline QRect systemButtonArea() const;
- void setSystemButtonArea(const QRect &rect);
+ inline ScreenRectCallback systemButtonAreaCallback() const;
+ void setSystemButtonAreaCallback(const ScreenRectCallback &callback);
#endif
bool isInSystemButtons(const QPoint &pos, WindowAgentBase::SystemButton *button) const;
@@ -49,9 +61,11 @@
enum WindowContextHook {
CentralizeHook = 1,
+ RaiseWindowHook,
ShowSystemMenuHook,
DefaultColorsHook,
- DrawWindows10BorderHook, // Only works on Windows 10
+ 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);
@@ -59,8 +73,13 @@
void showSystemMenu(const QPoint &pos);
void notifyWinIdChange();
+ virtual QVariant windowAttribute(const QString &key) const;
+ virtual bool setWindowAttribute(const QString &key, const QVariant &attribute);
+
protected:
- virtual void winIdChanged(QWindow *oldWindow) = 0;
+ virtual void winIdChanged() = 0;
+ virtual bool windowAttributeChanged(const QString &key, const QVariant &attribute,
+ const QVariant &oldAttribute);
protected:
QObject *m_host{};
@@ -69,11 +88,16 @@
QSet<const QObject *> m_hitTestVisibleItems;
#ifdef Q_OS_MAC
- QRect m_systemButtonArea;
+ ScreenRectCallback m_systemButtonAreaCallback;
#endif
QObject *m_titleBar{};
- std::array<QObject *, WindowAgentBase::NumSystemButton> m_systemButtons{};
+ std::array<QObject *, WindowAgentBase::Close + 1> m_systemButtons{};
+
+ QVariantHash m_windowAttributes;
+
+ std::unique_ptr<QObject> m_windowEventFilter;
+ std::unique_ptr<QObject> m_winIdChangeEventFilter;
};
inline QObject *AbstractWindowContext::host() const {
@@ -102,8 +126,8 @@
}
#ifdef Q_OS_MAC
- inline QRect AbstractWindowContext::systemButtonArea() const {
- return m_systemButtonArea;
+ inline ScreenRectCallback AbstractWindowContext::systemButtonAreaCallback() const {
+ return m_systemButtonAreaCallback;
}
#endif
--
Gitblit v1.9.1