From 364f4aec17e88adb5a0f3faad28176fc7cb89c74 Mon Sep 17 00:00:00 2001 From: Zhao Yuhang <2546789017@qq.com> Date: ćšć, 14 12æ 2023 20:06:49 +0800 Subject: [PATCH] macos cleanup --- src/quick/quickwindowagent.cpp | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/quick/quickwindowagent.cpp b/src/quick/quickwindowagent.cpp index 59949f2..9422f65 100644 --- a/src/quick/quickwindowagent.cpp +++ b/src/quick/quickwindowagent.cpp @@ -1,9 +1,10 @@ #include "quickwindowagent.h" #include "quickwindowagent_p.h" -#include "quickitemdelegate_p.h" - #include <QtQuick/QQuickWindow> +#include <QtQuick/private/qquickanchors_p.h> + +#include "quickitemdelegate_p.h" namespace QWK { @@ -35,9 +36,13 @@ } if (!d->setup(window, new QuickItemDelegate())) { - return true; + return false; } d->hostWindow = window; + +#ifdef Q_OS_WINDOWS + d->setupWindows10BorderWorkaround(); +#endif return true; } @@ -67,23 +72,24 @@ Q_EMIT systemButtonChanged(button, item); } - bool QuickWindowAgent::isHitTestVisible(QQuickItem *item) const { + bool QuickWindowAgent::isHitTestVisible(const QQuickItem *item) const { Q_D(const QuickWindowAgent); return d->context->isHitTestVisible(item); } - void QuickWindowAgent::setHitTestVisible(QQuickItem *item, bool visible) { + void QuickWindowAgent::setHitTestVisible_item(const QQuickItem *item, bool visible) { Q_D(QuickWindowAgent); d->context->setHitTestVisible(item, visible); } - void QuickWindowAgent::setHitTestVisible(const QRect &rect, bool visible) { + void QuickWindowAgent::setHitTestVisible_rect(const QRect &rect, bool visible) { Q_D(QuickWindowAgent); d->context->setHitTestVisible(rect, visible); } QuickWindowAgent::QuickWindowAgent(QuickWindowAgentPrivate &d, QObject *parent) - : CoreWindowAgent(d, parent) { + : WindowAgentBase(d, parent) { d.init(); } -} + +} \ No newline at end of file -- Gitblit v1.9.1