From 76924a335f40a0c3cc13805b4cb9429c336d33ca Mon Sep 17 00:00:00 2001
From: SineStriker <trueful@163.com>
Date: 周五, 29 12月 2023 11:34:22 +0800
Subject: [PATCH] Optimize system button area APIs
---
src/widgets/widgetwindowagent_mac.cpp | 48 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/src/widgets/widgetwindowagent_mac.cpp b/src/widgets/widgetwindowagent_mac.cpp
index c21327c..d3cb1ba 100644
--- a/src/widgets/widgetwindowagent_mac.cpp
+++ b/src/widgets/widgetwindowagent_mac.cpp
@@ -4,28 +4,36 @@
namespace QWK {
+ static inline QRect getWidgetSceneRect(QWidget *widget) {
+ return {widget->mapTo(widget->window(), QPoint()), widget->size()};
+ }
+
class SystemButtonAreaWidgetEventFilter : public QObject {
public:
SystemButtonAreaWidgetEventFilter(QWidget *widget, AbstractWindowContext *ctx,
QObject *parent = nullptr)
: QObject(parent), widget(widget), ctx(ctx) {
widget->installEventFilter(this);
+ ctx->setSystemButtonAreaCallback([widget](const QSize &) {
+ return getWidgetSceneRect(widget); //
+ });
}
- ~SystemButtonAreaWidgetEventFilter() = default;
+ ~SystemButtonAreaWidgetEventFilter() override = default;
protected:
bool eventFilter(QObject *obj, QEvent *event) override {
+ Q_UNUSED(obj)
switch (event->type()) {
case QEvent::Move:
case QEvent::Resize: {
- ctx->setSystemButtonArea(widget->geometry());
+ ctx->virtual_hook(AbstractWindowContext::SystemButtonAreaChangedHook, nullptr);
break;
}
default:
break;
}
- return QObject::eventFilter(obj, event);
+ return false;
}
protected:
@@ -33,22 +41,54 @@
AbstractWindowContext *ctx;
};
+ /*!
+ Returns the widget that acts as the system button area.
+ */
QWidget *WidgetWindowAgent::systemButtonArea() const {
Q_D(const WidgetWindowAgent);
return d->systemButtonAreaWidget;
}
+ /*!
+ Sets the widget that acts as the system button area. The system button will be centered in
+ its area, it is recommended to place the widget in a layout and set a fixed size policy.
+
+ The system button will be visible in the system title bar area.
+ */
void WidgetWindowAgent::setSystemButtonArea(QWidget *widget) {
Q_D(WidgetWindowAgent);
+ if (d->systemButtonAreaWidget == widget)
+ return;
+
auto ctx = d->context.get();
d->systemButtonAreaWidget = widget;
if (!widget) {
+ d->context->setSystemButtonAreaCallback({});
d->systemButtonAreaWidgetEventFilter.reset();
- ctx->setSystemButtonArea({});
return;
}
d->systemButtonAreaWidgetEventFilter =
std::make_unique<SystemButtonAreaWidgetEventFilter>(widget, ctx);
}
+ /*!
+ Returns the the system button area callback.
+ */
+ ScreenRectCallback WidgetWindowAgent::systemButtonAreaCallback() const {
+ Q_D(const WidgetWindowAgent);
+ return d->systemButtonAreaWidget ? nullptr : d->context->systemButtonAreaCallback();
+ }
+
+ /*!
+ Sets the the system button area callback, the \c size of the callback is the native title
+ bar size.
+
+ The system button position will be updated when the window resizes.
+ */
+ void WidgetWindowAgent::setSystemButtonAreaCallback(const ScreenRectCallback &callback) {
+ Q_D(WidgetWindowAgent);
+ setSystemButtonArea(nullptr);
+ d->context->setSystemButtonAreaCallback(callback);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.1