From 555a8181fff96271812476f2169f2713d7734f4b Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周五, 22 12月 2023 21:39:47 +0800
Subject: [PATCH] Add conditional compile options to Quick
---
src/quick/quickwindowagent.cpp | 40 ++++++++++++++++++----------------------
1 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/src/quick/quickwindowagent.cpp b/src/quick/quickwindowagent.cpp
index 9cee1b5..4e07a3d 100644
--- a/src/quick/quickwindowagent.cpp
+++ b/src/quick/quickwindowagent.cpp
@@ -2,16 +2,15 @@
#include "quickwindowagent_p.h"
#include <QtQuick/QQuickWindow>
+#include <QtQuick/private/qquickanchors_p.h>
#include "quickitemdelegate_p.h"
namespace QWK {
- QuickWindowAgentPrivate::QuickWindowAgentPrivate() {
- }
+ QuickWindowAgentPrivate::QuickWindowAgentPrivate() = default;
- QuickWindowAgentPrivate::~QuickWindowAgentPrivate() {
- }
+ QuickWindowAgentPrivate::~QuickWindowAgentPrivate() = default;
void QuickWindowAgentPrivate::init() {
}
@@ -20,8 +19,7 @@
: QuickWindowAgent(*new QuickWindowAgentPrivate(), parent) {
}
- QuickWindowAgent::~QuickWindowAgent() {
- }
+ QuickWindowAgent::~QuickWindowAgent() = default;
bool QuickWindowAgent::setup(QQuickWindow *window) {
Q_ASSERT(window);
@@ -34,19 +32,21 @@
return false;
}
- if (!d->setup(window, new QuickItemDelegate())) {
- return true;
- }
+ d->setup(window, new QuickItemDelegate());
d->hostWindow = window;
+
+#ifdef Q_OS_WINDOWS
+ d->setupWindows10BorderWorkaround();
+#endif
return true;
}
- const QQuickItem *QuickWindowAgent::titleBar() const {
+ QQuickItem *QuickWindowAgent::titleBar() const {
Q_D(const QuickWindowAgent);
- return static_cast<const QQuickItem *>(d->context->titleBar());
+ return static_cast<QQuickItem *>(d->context->titleBar());
}
- void QuickWindowAgent::setTitleBar(const QQuickItem *item) {
+ void QuickWindowAgent::setTitleBar(QQuickItem *item) {
Q_D(QuickWindowAgent);
if (!d->context->setTitleBar(item)) {
return;
@@ -54,12 +54,12 @@
Q_EMIT titleBarWidgetChanged(item);
}
- const QQuickItem *QuickWindowAgent::systemButton(SystemButton button) const {
+ QQuickItem *QuickWindowAgent::systemButton(SystemButton button) const {
Q_D(const QuickWindowAgent);
- return static_cast<const QQuickItem *>(d->context->systemButton(button));
+ return static_cast<QQuickItem *>(d->context->systemButton(button));
}
- void QuickWindowAgent::setSystemButton(SystemButton button, const QQuickItem *item) {
+ void QuickWindowAgent::setSystemButton(SystemButton button, QQuickItem *item) {
Q_D(QuickWindowAgent);
if (!d->context->setSystemButton(button, item)) {
return;
@@ -72,18 +72,14 @@
return d->context->isHitTestVisible(item);
}
- void QuickWindowAgent::setHitTestVisible_item(const QQuickItem *item, bool visible) {
+ void QuickWindowAgent::setHitTestVisible(const QQuickItem *item, bool visible) {
Q_D(QuickWindowAgent);
d->context->setHitTestVisible(item, visible);
- }
-
- void QuickWindowAgent::setHitTestVisible_rect(const QRect &rect, bool visible) {
- Q_D(QuickWindowAgent);
- d->context->setHitTestVisible(rect, visible);
}
QuickWindowAgent::QuickWindowAgent(QuickWindowAgentPrivate &d, QObject *parent)
: WindowAgentBase(d, parent) {
d.init();
}
-}
+
+}
\ No newline at end of file
--
Gitblit v1.9.1