From 3e942c3dc8955be577079fbc028ce216e1c594b2 Mon Sep 17 00:00:00 2001
From: SineStriker <55847490+SineStriker@users.noreply.github.com>
Date: 周二, 11 2月 2025 19:07:53 +0800
Subject: [PATCH] Fix numerous bugs (#162)
---
src/core/contexts/abstractwindowcontext_p.h | 149 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 124 insertions(+), 25 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index a92d91d..e978cb4 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -1,71 +1,164 @@
+// 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 <list>
#include <memory>
+#include <utility>
#include <QtCore/QSet>
+#include <QtCore/QPointer>
+#include <QtGui/QRegion>
#include <QtGui/QWindow>
-#include <QtGui/QPolygon>
-#include <QWKCore/corewindowagent.h>
-#include <QWKCore/windowitemdelegate.h>
+#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(QWindow *window, WindowItemDelegate *delegate);
+ AbstractWindowContext();
~AbstractWindowContext() override;
public:
- virtual bool setup() = 0;
+ void setup(QObject *host, WindowItemDelegate *delegate);
+ inline QObject *host() const;
inline QWindow *window() const;
- void setupWindow(QWindow *window);
+ inline WId windowId() const;
+ inline WindowItemDelegate *delegate() const;
- inline bool isHitTestVisible(QObject *obj) const;
+ inline bool isHitTestVisible(const QObject *obj) const;
bool setHitTestVisible(QObject *obj, bool visible);
- bool setHitTestVisible(const QRect &rect, bool visible);
- inline QObject *systemButton(CoreWindowAgent::SystemButton button) const;
- bool setSystemButton(CoreWindowAgent::SystemButton button, QObject *obj);
+ inline QObject *systemButton(WindowAgentBase::SystemButton button) const;
+ bool setSystemButton(WindowAgentBase::SystemButton button, QObject *obj);
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, CoreWindowAgent::SystemButton *button) const;
+ bool isInSystemButtons(const QPoint &pos, WindowAgentBase::SystemButton *button) const;
bool isInTitleBarDraggableArea(const QPoint &pos) const;
- protected:
- QWindow *m_windowHandle;
- std::unique_ptr<WindowItemDelegate> m_delegate;
+ 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;
+ }
- QSet<QObject *> m_hitTestVisibleItems;
- QList<QRect> m_hitTestVisibleRects;
+ virtual QString key() const;
+
+ enum WindowContextHook {
+ CentralizeHook = 1,
+ RaiseWindowHook,
+ ShowSystemMenuHook,
+ DefaultColorsHook,
+ DrawWindows10BorderHook_Emulated, // Only works on Windows 10, emulated workaround
+ DrawWindows10BorderHook_Native, // Only works on Windows 10, native workaround
+ SystemButtonAreaChangedHook, // Only works on Mac
+ };
+ virtual void virtual_hook(int id, void *data);
+
+ void showSystemMenu(const QPoint &pos);
+ void notifyWinIdChange();
+
+ virtual QVariant windowAttribute(const QString &key) const;
+ virtual bool setWindowAttribute(const QString &key, const QVariant &attribute);
+
+ protected:
+ 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;
+ QPointer<QWindow> m_windowHandle;
+ WId m_windowId{};
+
+ QSet<const QObject *> m_hitTestVisibleItems;
+#ifdef Q_OS_MAC
+ ScreenRectCallback m_systemButtonAreaCallback;
+#endif
QObject *m_titleBar{};
- std::array<QObject *, CoreWindowAgent::NumSystemButton> m_systemButtons{};
+ std::array<QObject *, WindowAgentBase::Close + 1> m_systemButtons{};
- // Cached shape
- mutable bool hitTestVisibleShapeDirty{};
- mutable QRegion hitTestVisibleShape;
+ std::list<std::pair<QString, QVariant>> m_windowAttributesOrder;
+ QHash<QString, decltype(m_windowAttributesOrder)::iterator> 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 {
+ return m_host;
+ }
inline QWindow *AbstractWindowContext::window() const {
return m_windowHandle;
}
- inline bool AbstractWindowContext::isHitTestVisible(QObject *obj) const {
+ 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 {
return m_hitTestVisibleItems.contains(obj);
}
inline QObject *
- AbstractWindowContext::systemButton(CoreWindowAgent::SystemButton button) const {
+ AbstractWindowContext::systemButton(WindowAgentBase::SystemButton button) const {
return m_systemButtons[button];
}
@@ -73,6 +166,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