From 46285db399f75154ad6c451e12f2cae2e59ace25 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周日, 24 12月 2023 23:52:03 +0800
Subject: [PATCH] Use brilliant workaround to show Windows 10 top border
---
src/core/contexts/abstractwindowcontext_p.h | 23 ++++++++---------------
1 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index 1882369..f8ea17e 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -38,7 +38,7 @@
inline WindowItemDelegate *delegate() const;
inline QVariant windowAttribute(const QString &key) const;
- void setWindowAttribute(const QString &key, const QVariant &var);
+ bool setWindowAttribute(const QString &key, const QVariant &attribute);
inline bool isHitTestVisible(const QObject *obj) const;
bool setHitTestVisible(const QObject *obj, bool visible);
@@ -64,8 +64,8 @@
RaiseWindowHook,
ShowSystemMenuHook,
DefaultColorsHook,
- WindowAttributeChangedHook,
- 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);
@@ -73,11 +73,10 @@
void showSystemMenu(const QPoint &pos);
void notifyWinIdChange();
- inline bool isEnabled() const;
- void setEnabled(bool enabled);
-
protected:
- virtual void winIdChanged(QWindow *oldWindow, bool isDestroyed) = 0;
+ virtual void winIdChanged() = 0;
+ virtual bool windowAttributeChanged(const QString &key, const QVariant &attribute,
+ const QVariant &oldAttribute);
protected:
QObject *m_host{};
@@ -90,13 +89,11 @@
#endif
QObject *m_titleBar{};
- std::array<QObject *, WindowAgentBase::NumSystemButton> m_systemButtons{};
+ std::array<QObject *, WindowAgentBase::Close + 1> m_systemButtons{};
QVariantHash m_windowAttributes;
- private:
- bool m_internalEnabled = false;
- QPointer<QWindow> m_windowHandleCache;
+ std::unique_ptr<QObject> m_winIdChangeEventFilter;
};
inline QObject *AbstractWindowContext::host() const {
@@ -133,10 +130,6 @@
return m_systemButtonArea;
}
#endif
-
- inline bool AbstractWindowContext::isEnabled() const {
- return m_internalEnabled;
- }
}
--
Gitblit v1.9.1