From 7a54badb4a5782c551deb2919f3c489fdb4fbc02 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周日, 03 12月 2023 17:17:40 +0800
Subject: [PATCH] Add snap layout handling
---
src/widgets/widgetwindowagent.cpp | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index d3200a7..1bf0b4e 100644
--- a/src/widgets/widgetwindowagent.cpp
+++ b/src/widgets/widgetwindowagent.cpp
@@ -21,45 +21,48 @@
WidgetWindowAgent::~WidgetWindowAgent() {
}
- void WidgetWindowAgent::setup(QWidget *w) {
+ bool WidgetWindowAgent::setup(QWidget *w) {
Q_ASSERT(w);
if (!w) {
- return;
+ return false;
}
Q_D(WidgetWindowAgent);
- if (d->host) {
- return;
+ if (d->hostWidget) {
+ return false;
}
- d->host = w;
std::ignore = w->winId(); // Make sure the window handle is created
- d->setup(w->windowHandle(), new WidgetItemDelegate());
+ if (!d->setup(w->windowHandle(), new WidgetItemDelegate())) {
+ return false;
+ }
+ d->hostWidget = w;
+ return true;
}
bool WidgetWindowAgent::isHitTestVisible(QWidget *w) const {
Q_D(const WidgetWindowAgent);
- return d->m_eventHandler->isHitTestVisible(w);
+ return d->eventHandler->isHitTestVisible(w);
}
void WidgetWindowAgent::setHitTestVisible(QWidget *w, bool visible) {
Q_D(WidgetWindowAgent);
- d->m_eventHandler->setHitTestVisible(w, visible);
+ d->eventHandler->setHitTestVisible(w, visible);
}
void WidgetWindowAgent::setHitTestVisible(const QRect &rect, bool visible) {
Q_D(WidgetWindowAgent);
- d->m_eventHandler->setHitTestVisible(rect, visible);
+ d->eventHandler->setHitTestVisible(rect, visible);
}
QWidget *WidgetWindowAgent::systemButton(CoreWindowAgent::SystemButton button) const {
Q_D(const WidgetWindowAgent);
- return static_cast<QWidget *>(d->m_eventHandler->systemButton(button));
+ return static_cast<QWidget *>(d->eventHandler->systemButton(button));
}
void WidgetWindowAgent::setSystemButton(CoreWindowAgent::SystemButton button, QWidget *w) {
Q_D(WidgetWindowAgent);
- if (!d->m_eventHandler->setSystemButton(button, w)) {
+ if (!d->eventHandler->setSystemButton(button, w)) {
return;
}
Q_EMIT systemButtonChanged(button, w);
@@ -67,12 +70,12 @@
QWidget *WidgetWindowAgent::titleBar() const {
Q_D(const WidgetWindowAgent);
- return static_cast<QWidget *>(d->m_eventHandler->titleBar());
+ return static_cast<QWidget *>(d->eventHandler->titleBar());
}
void WidgetWindowAgent::setTitleBar(QWidget *w) {
Q_D(WidgetWindowAgent);
- if (!d->m_eventHandler->setTitleBar(w)) {
+ if (!d->eventHandler->setTitleBar(w)) {
return;
}
Q_EMIT titleBarWidgetChanged(w);
--
Gitblit v1.9.1