From dd961a654f29fe6a59a093f8b4b0fff726efbd4a Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周三, 08 5月 2024 11:55:57 +0800
Subject: [PATCH] Fix a mistake
---
src/core/contexts/abstractwindowcontext_p.h | 54 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index 29f6749..52eb5cc 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -1,5 +1,18 @@
+// 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>
@@ -11,11 +24,15 @@
#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, public NativeEventDispatcher {
+ class QWK_CORE_EXPORT AbstractWindowContext : public QObject,
+ public NativeEventDispatcher,
+ public SharedEventDispatcher {
Q_OBJECT
public:
AbstractWindowContext();
@@ -26,6 +43,7 @@
inline QObject *host() const;
inline QWindow *window() const;
+ inline WId windowId() const;
inline WindowItemDelegate *delegate() const;
inline bool isHitTestVisible(const QObject *obj) const;
@@ -38,8 +56,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 +67,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,22 +79,32 @@
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, bool destroyed) = 0;
+ 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_windowHandleGuard;
+ WId m_windowId{};
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<WinIdChangeEventFilter> m_winIdChangeEventFilter;
};
inline QObject *AbstractWindowContext::host() const {
@@ -83,6 +113,10 @@
inline QWindow *AbstractWindowContext::window() const {
return m_windowHandle;
+ }
+
+ inline WId AbstractWindowContext::windowId() const {
+ return m_windowId;
}
inline WindowItemDelegate *AbstractWindowContext::delegate() const {
@@ -103,8 +137,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