From 0586c98f90866e4bc9f0dfe73aefb0a07c56697e Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 12 12月 2023 15:44:14 +0800
Subject: [PATCH] Add win10 border handler
---
src/widgets/widgetwindowagent.cpp | 131 +++++++++++++++++++++++++++++++++----------
1 files changed, 99 insertions(+), 32 deletions(-)
diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index 1bf0b4e..e869010 100644
--- a/src/widgets/widgetwindowagent.cpp
+++ b/src/widgets/widgetwindowagent.cpp
@@ -1,9 +1,62 @@
#include "widgetwindowagent.h"
#include "widgetwindowagent_p.h"
+#include <QtGui/QtEvents>
+#include <QtGui/QPainter>
+#include <QtCore/QDebug>
+
+#ifdef Q_OS_WINDOWS
+# include <QWKCore/private/win10borderhandler_p.h>
+#endif
+
#include "widgetitemdelegate_p.h"
namespace QWK {
+
+#ifdef Q_OS_WINDOWS
+ class WidgetBorderHandler : public QObject, public Win10BorderHandler {
+ public:
+ explicit WidgetBorderHandler(QWidget *widget)
+ : Win10BorderHandler(widget->windowHandle()), widget(widget) {
+ widget->installEventFilter(this);
+ }
+
+ void updateGeometry() override {
+ if (widget->windowState() & (Qt::WindowMaximized | Qt::WindowFullScreen)) {
+ widget->setContentsMargins({});
+ } else {
+ widget->setContentsMargins({0, int(m_borderThickness), 0, 0});
+ }
+ }
+
+ void requestUpdate() override {
+ widget->update();
+ }
+
+ bool isActive() const override {
+ return widget->isActiveWindow();
+ }
+
+ protected:
+ bool eventFilter(QObject *obj, QEvent *event) override {
+ switch (event->type()) {
+ case QEvent::Paint: {
+ if (widget->windowState() & (Qt::WindowMaximized | Qt::WindowFullScreen))
+ break;
+ auto paintEvent = static_cast<QPaintEvent *>(event);
+ QPainter painter(widget);
+ paintBorder(painter, paintEvent->rect(), paintEvent->region());
+ return true;
+ }
+ default:
+ break;
+ }
+ return false;
+ }
+
+ QWidget *widget;
+ };
+#endif
WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() {
}
@@ -32,57 +85,71 @@
return false;
}
- std::ignore = w->winId(); // Make sure the window handle is created
- if (!d->setup(w->windowHandle(), new WidgetItemDelegate())) {
+ w->setAttribute(Qt::WA_DontCreateNativeAncestors);
+ w->setAttribute(Qt::WA_NativeWindow);
+
+ if (!d->setup(w, new WidgetItemDelegate())) {
return false;
}
d->hostWidget = w;
- return true;
- }
- bool WidgetWindowAgent::isHitTestVisible(QWidget *w) const {
- Q_D(const WidgetWindowAgent);
- return d->eventHandler->isHitTestVisible(w);
- }
-
- void WidgetWindowAgent::setHitTestVisible(QWidget *w, bool visible) {
- Q_D(WidgetWindowAgent);
- d->eventHandler->setHitTestVisible(w, visible);
- }
-
- void WidgetWindowAgent::setHitTestVisible(const QRect &rect, bool visible) {
- Q_D(WidgetWindowAgent);
- d->eventHandler->setHitTestVisible(rect, visible);
- }
-
- QWidget *WidgetWindowAgent::systemButton(CoreWindowAgent::SystemButton button) const {
- Q_D(const WidgetWindowAgent);
- return static_cast<QWidget *>(d->eventHandler->systemButton(button));
- }
-
- void WidgetWindowAgent::setSystemButton(CoreWindowAgent::SystemButton button, QWidget *w) {
- Q_D(WidgetWindowAgent);
- if (!d->eventHandler->setSystemButton(button, w)) {
- return;
+#ifdef Q_OS_WINDOWS
+ // Install painting hook
+ if (bool needPaintBorder;
+ QMetaObject::invokeMethod(d->context.get(), "needWin10BorderHandler",
+ Qt::DirectConnection, Q_RETURN_ARG(bool, needPaintBorder)),
+ needPaintBorder) {
+ QMetaObject::invokeMethod(d->context.get(), "setWin10BorderHandler",
+ Qt::DirectConnection,
+ Q_ARG(Win10BorderHandler *, new WidgetBorderHandler(w)));
}
- Q_EMIT systemButtonChanged(button, w);
+#endif
+ return true;
}
QWidget *WidgetWindowAgent::titleBar() const {
Q_D(const WidgetWindowAgent);
- return static_cast<QWidget *>(d->eventHandler->titleBar());
+ return static_cast<QWidget *>(d->context->titleBar());
}
void WidgetWindowAgent::setTitleBar(QWidget *w) {
Q_D(WidgetWindowAgent);
- if (!d->eventHandler->setTitleBar(w)) {
+ if (!d->context->setTitleBar(w)) {
return;
}
Q_EMIT titleBarWidgetChanged(w);
}
+ QWidget *WidgetWindowAgent::systemButton(SystemButton button) const {
+ Q_D(const WidgetWindowAgent);
+ return static_cast<QWidget *>(d->context->systemButton(button));
+ }
+
+ void WidgetWindowAgent::setSystemButton(SystemButton button, QWidget *w) {
+ Q_D(WidgetWindowAgent);
+ if (!d->context->setSystemButton(button, w)) {
+ return;
+ }
+ Q_EMIT systemButtonChanged(button, w);
+ }
+
+ bool WidgetWindowAgent::isHitTestVisible(const QWidget *w) const {
+ Q_D(const WidgetWindowAgent);
+ return d->context->isHitTestVisible(w);
+ }
+
+ void WidgetWindowAgent::setHitTestVisible(const QWidget *w, bool visible) {
+ Q_D(WidgetWindowAgent);
+ d->context->setHitTestVisible(w, visible);
+ }
+
+ void WidgetWindowAgent::setHitTestVisible(const QRect &rect, bool visible) {
+ Q_D(WidgetWindowAgent);
+ d->context->setHitTestVisible(rect, visible);
+ }
+
WidgetWindowAgent::WidgetWindowAgent(WidgetWindowAgentPrivate &d, QObject *parent)
- : CoreWindowAgent(d, parent) {
+ : WindowAgentBase(d, parent) {
d.init();
}
}
--
Gitblit v1.9.1