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/widgets/widgetwindowagent.cpp | 126 ++++++++++++++++++++++++++++++++---------
1 files changed, 97 insertions(+), 29 deletions(-)
diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index 252213e..e2a36d1 100644
--- a/src/widgets/widgetwindowagent.cpp
+++ b/src/widgets/widgetwindowagent.cpp
@@ -1,26 +1,49 @@
+// Copyright (C) 2023-2024 Stdware Collections (https://www.github.com/stdware)
+// Copyright (C) 2021-2023 wangwenx190 (Yuhang Zhao)
+// SPDX-License-Identifier: Apache-2.0
+
#include "widgetwindowagent.h"
#include "widgetwindowagent_p.h"
+
+#include <QtGui/QtEvents>
+#include <QtGui/QPainter>
+#include <QtCore/QDebug>
#include "widgetitemdelegate_p.h"
namespace QWK {
- WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() {
- }
+ /*!
+ \class WidgetWindowAgent
+ \brief WindowAgentBase is the window agent for QtWidgets.
- WidgetWindowAgentPrivate::~WidgetWindowAgentPrivate() {
- }
+ It provides interfaces for QtWidgets and processes some Qt events related to the QWidget
+ instance.
+ */
+
+ WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() = default;
+
+ WidgetWindowAgentPrivate::~WidgetWindowAgentPrivate() = default;
void WidgetWindowAgentPrivate::init() {
}
+ /*!
+ Constructs a widget agent, it's better to set the widget to setup as \a parent.
+ */
WidgetWindowAgent::WidgetWindowAgent(QObject *parent)
: WidgetWindowAgent(*new WidgetWindowAgentPrivate(), parent) {
}
- WidgetWindowAgent::~WidgetWindowAgent() {
- }
+ /*!
+ Destructor.
+ */
+ WidgetWindowAgent::~WidgetWindowAgent() = default;
+ /*!
+ Installs the window agent on the widget. The window agent will take over some of the window
+ events, making the window look frameless.
+ */
bool WidgetWindowAgent::setup(QWidget *w) {
Q_ASSERT(w);
if (!w) {
@@ -32,35 +55,59 @@
return false;
}
- std::ignore = w->winId(); // Make sure the window handle is created
- if (!d->setup(w->windowHandle(), new WidgetItemDelegate())) {
- return false;
- }
+ // Qt will create invisible native window container for native QWidget
+ // without this attribute, and this behavior will break QWK functionality.
+ // So far enabling this attribute is a must for QWK users.
+ w->setAttribute(Qt::WA_DontCreateNativeAncestors);
+ // Make sure the native window handle is actually created before we apply
+ // various hooks.
+ w->setAttribute(Qt::WA_NativeWindow);
+
+ d->setup(w, new WidgetItemDelegate());
d->hostWidget = w;
+
+#if defined(Q_OS_WINDOWS) && QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)
+ d->setupWindows10BorderWorkaround();
+#endif
return true;
}
- bool WidgetWindowAgent::isHitTestVisible(QWidget *w) const {
+ /*!
+ Returns the title bar widget.
+ */
+ QWidget *WidgetWindowAgent::titleBar() const {
Q_D(const WidgetWindowAgent);
- return d->context->isHitTestVisible(w);
+ return static_cast<QWidget *>(d->context->titleBar());
}
- void WidgetWindowAgent::setHitTestVisible(QWidget *w, bool visible) {
+ /*!
+ Sets the title bar widget, all system button and hit-test visible widget references that
+ have been set will be removed.
+ */
+ void WidgetWindowAgent::setTitleBar(QWidget *w) {
Q_D(WidgetWindowAgent);
- d->context->setHitTestVisible(w, visible);
+ if (!d->context->setTitleBar(w)) {
+ return;
+ }
+#ifdef Q_OS_MAC
+ setSystemButtonArea(nullptr);
+#endif
+ Q_EMIT titleBarChanged(w);
}
- void WidgetWindowAgent::setHitTestVisible(const QRect &rect, bool visible) {
- Q_D(WidgetWindowAgent);
- d->context->setHitTestVisible(rect, visible);
- }
-
- QWidget *WidgetWindowAgent::systemButton(CoreWindowAgent::SystemButton button) const {
+ /*!
+ Returns the system button of the given type.
+ */
+ QWidget *WidgetWindowAgent::systemButton(SystemButton button) const {
Q_D(const WidgetWindowAgent);
return static_cast<QWidget *>(d->context->systemButton(button));
}
- void WidgetWindowAgent::setSystemButton(CoreWindowAgent::SystemButton button, QWidget *w) {
+ /*!
+ Sets the system button of the given type, the system buttons always receive mouse events so
+ you don't need to call \c setHitTestVisible for them.
+ */
+ void WidgetWindowAgent::setSystemButton(SystemButton button, QWidget *w) {
Q_D(WidgetWindowAgent);
if (!d->context->setSystemButton(button, w)) {
return;
@@ -68,21 +115,42 @@
Q_EMIT systemButtonChanged(button, w);
}
- QWidget *WidgetWindowAgent::titleBar() const {
+ /*!
+ Returns \a true if the widget can receive mouse events on title bar.
+ */
+ bool WidgetWindowAgent::isHitTestVisible(const QWidget *w) const {
Q_D(const WidgetWindowAgent);
- return static_cast<QWidget *>(d->context->titleBar());
+ return d->context->isHitTestVisible(w);
}
- void WidgetWindowAgent::setTitleBar(QWidget *w) {
+ /*!
+ Makes the widget able to receive mouse events on title bar if \a visible is \c true.
+ You're supposed to make sure that the specified widget \a w is a child or descendant
+ of the title bar widget.
+ */
+ void WidgetWindowAgent::setHitTestVisible(QWidget *w, bool visible) {
Q_D(WidgetWindowAgent);
- if (!d->context->setTitleBar(w)) {
- return;
- }
- Q_EMIT titleBarWidgetChanged(w);
+ d->context->setHitTestVisible(w, visible);
}
+ /*!
+ \internal
+ */
WidgetWindowAgent::WidgetWindowAgent(WidgetWindowAgentPrivate &d, QObject *parent)
- : CoreWindowAgent(d, parent) {
+ : WindowAgentBase(d, parent) {
d.init();
}
+
+ /*!
+ \fn void WidgetWindowAgent::titleBarChanged(const QWidget *w)
+
+ This signal is emitted when the title bar widget is replaced.
+ */
+
+ /*!
+ \fn void WidgetWindowAgent::systemButtonChanged(SystemButton button, const QWidget *w)
+
+ This signal is emitted when a system button is replaced.
+ */
+
}
--
Gitblit v1.9.1