From 3fbcf1aa8f91a804af50fad4e2b122f698259c94 Mon Sep 17 00:00:00 2001 From: Sine Striker <trueful@163.com> Date: ćšć, 09 5æ 2024 23:45:28 +0800 Subject: [PATCH] Remove `isHostSizeFixed` in delegate --- src/widgets/widgetitemdelegate.cpp | 76 ++++++++++++++++++++++++++----------- 1 files changed, 53 insertions(+), 23 deletions(-) diff --git a/src/widgets/widgetitemdelegate.cpp b/src/widgets/widgetitemdelegate.cpp index f6cb467..b1b7f6c 100644 --- a/src/widgets/widgetitemdelegate.cpp +++ b/src/widgets/widgetitemdelegate.cpp @@ -1,12 +1,41 @@ +// 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 "widgetitemdelegate_p.h" #include <QtGui/QMouseEvent> -#include <QtWidgets/QWidget> #include <QtWidgets/QApplication> +#include <QtWidgets/QWidget> -extern Q_WIDGETS_EXPORT QWidget *qt_button_down; +#include <QWKCore/private/abstractwindowcontext_p.h> + +extern Q_DECL_IMPORT QWidget *qt_button_down; namespace QWK { + + class WidgetWinIdChangeEventFilter : public WinIdChangeEventFilter { + public: + explicit WidgetWinIdChangeEventFilter(QObject *host, AbstractWindowContext *ctx) + : WinIdChangeEventFilter(host, ctx), widget(static_cast<QWidget *>(host)) { + widget->installEventFilter(this); + } + + WId winId() const override { + return widget->effectiveWinId(); + } + + protected: + bool eventFilter(QObject *obj, QEvent *event) override { + Q_UNUSED(obj) + if (event->type() == QEvent::WinIdChange) { + context->notifyWinIdChange(); + } + return false; + } + + QWidget *widget; + }; WidgetItemDelegate::WidgetItemDelegate() = default; @@ -33,27 +62,6 @@ QWindow *WidgetItemDelegate::hostWindow(const QObject *host) const { return static_cast<const QWidget *>(host)->windowHandle(); - } - - bool WidgetItemDelegate::isHostSizeFixed(const QObject *host) const { - const auto widget = static_cast<const QWidget *>(host); - // "Qt::MSWindowsFixedSizeDialogHint" is used cross-platform actually. - if (widget->windowFlags() & Qt::MSWindowsFixedSizeDialogHint) { - return true; - } - // Caused by setFixedWidth/Height/Size(). - const QSize minSize = widget->minimumSize(); - const QSize maxSize = widget->maximumSize(); - if (!minSize.isEmpty() && !maxSize.isEmpty() && (minSize == maxSize)) { - return true; - } - // Usually set by the user. - const QSizePolicy sizePolicy = widget->sizePolicy(); - if ((sizePolicy.horizontalPolicy() == QSizePolicy::Fixed) && - (sizePolicy.verticalPolicy() == QSizePolicy::Fixed)) { - return true; - } - return false; } bool WidgetItemDelegate::isWindowActive(const QObject *host) const { @@ -94,8 +102,30 @@ return static_cast<const QWidget *>(host)->windowFlags(); } + QRect WidgetItemDelegate::getGeometry(const QObject *host) const { + return static_cast<const QWidget *>(host)->geometry(); + } + void WidgetItemDelegate::setWindowFlags(QObject *host, Qt::WindowFlags flags) const { static_cast<QWidget *>(host)->setWindowFlags(flags); } + void WidgetItemDelegate::setWindowVisible(QObject *host, bool visible) const { + static_cast<QWidget *>(host)->setVisible(visible); + } + + void WidgetItemDelegate::setGeometry(QObject *host, const QRect &rect) { + static_cast<QWidget *>(host)->setGeometry(rect); + } + + void WidgetItemDelegate::bringWindowToTop(QObject *host) const { + static_cast<QWidget *>(host)->raise(); + } + + WinIdChangeEventFilter * + WidgetItemDelegate::createWinIdEventFilter(QObject *host, + AbstractWindowContext *context) const { + return new WidgetWinIdChangeEventFilter(host, context); + } + } \ No newline at end of file -- Gitblit v1.9.1