From bdc57c6ec9b08f74ca65a06b8496fbaa3268c5fd Mon Sep 17 00:00:00 2001
From: Dylan Liu <mentalflow@ourdocs.cn>
Date: 周六, 04 5月 2024 20:51:20 +0800
Subject: [PATCH] Fix macOS title bar buttons not displaying properly.
---
src/quick/quickitemdelegate.cpp | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 5 deletions(-)
diff --git a/src/quick/quickitemdelegate.cpp b/src/quick/quickitemdelegate.cpp
index 7bd1259..8fd14e4 100644
--- a/src/quick/quickitemdelegate.cpp
+++ b/src/quick/quickitemdelegate.cpp
@@ -1,3 +1,7 @@
+// 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 "quickitemdelegate_p.h"
#include <QtQuick/QQuickItem>
@@ -10,7 +14,7 @@
QuickItemDelegate::~QuickItemDelegate() = default;
- QWindow *QuickItemDelegate::window(QObject *obj) const {
+ QWindow *QuickItemDelegate::window(const QObject *obj) const {
return static_cast<const QQuickItem *>(obj)->window();
}
@@ -29,17 +33,59 @@
return QRectF(originPoint, size).toRect();
}
- QWindow *QuickItemDelegate::hostWindow(QObject *host) const {
- return static_cast<QQuickWindow *>(host);
+ QWindow *QuickItemDelegate::hostWindow(const QObject *host) const {
+ return static_cast<QQuickWindow *>(const_cast<QObject *>(host));
}
bool QuickItemDelegate::isHostSizeFixed(const QObject *host) const {
- // ### TOOD
- return false;
+ const auto window = static_cast<const QQuickWindow *>(host);
+ const auto minSize = window->minimumSize();
+ const auto maxSize = window->maximumSize();
+ return !minSize.isEmpty() && !maxSize.isEmpty() && minSize == maxSize;
}
bool QuickItemDelegate::isWindowActive(const QObject *host) const {
return static_cast<const QQuickWindow *>(host)->isActive();
}
+ Qt::WindowStates QuickItemDelegate::getWindowState(const QObject *host) const {
+ return static_cast<const QQuickWindow *>(host)->windowStates();
+ }
+
+ void QuickItemDelegate::setWindowState(QObject *host, Qt::WindowStates state) const {
+ static_cast<QQuickWindow *>(host)->setWindowStates(state);
+ }
+
+ void QuickItemDelegate::setCursorShape(QObject *host, const Qt::CursorShape shape) const {
+ static_cast<QQuickWindow *>(host)->setCursor(QCursor(shape));
+ }
+
+ void QuickItemDelegate::restoreCursorShape(QObject *host) const {
+ static_cast<QQuickWindow *>(host)->unsetCursor();
+ }
+
+ Qt::WindowFlags QuickItemDelegate::getWindowFlags(const QObject *host) const {
+ return static_cast<const QQuickWindow *>(host)->flags();
+ }
+
+ QRect QuickItemDelegate::getGeometry(const QObject *host) const {
+ return static_cast<const QQuickWindow *>(host)->geometry();
+ }
+
+ void QuickItemDelegate::setWindowFlags(QObject *host, Qt::WindowFlags flags) const {
+ static_cast<QQuickWindow *>(host)->setFlags(flags);
+ }
+
+ void QuickItemDelegate::setWindowVisible(QObject *host, bool visible) const {
+ static_cast<QQuickWindow *>(host)->setVisible(visible);
+ }
+
+ void QuickItemDelegate::setGeometry(QObject *host, const QRect &rect) {
+ static_cast<QQuickWindow *>(host)->setGeometry(rect);
+ }
+
+ void QuickItemDelegate::bringWindowToTop(QObject *host) const {
+ static_cast<QQuickWindow *>(host)->raise();
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.1