From bd3bb1d4d8fc9af3b9fe534d085f54d45aa50627 Mon Sep 17 00:00:00 2001 From: Zhao Yuhang <2546789017@qq.com> Date: ćšć, 14 12æ 2023 21:29:34 +0800 Subject: [PATCH] fix macos bug --- src/widgets/widgetitemdelegate.cpp | 45 ++++++++++++++++++++++++--------------------- 1 files changed, 24 insertions(+), 21 deletions(-) diff --git a/src/widgets/widgetitemdelegate.cpp b/src/widgets/widgetitemdelegate.cpp index bfa730c..ca8bb99 100644 --- a/src/widgets/widgetitemdelegate.cpp +++ b/src/widgets/widgetitemdelegate.cpp @@ -13,15 +13,15 @@ WidgetItemDelegate::~WidgetItemDelegate() = default; QWindow *WidgetItemDelegate::window(QObject *obj) const { - return static_cast<QWidget *>(obj)->windowHandle(); + return static_cast<const QWidget *>(obj)->windowHandle(); } - bool WidgetItemDelegate::isEnabled(QObject *obj) const { - return static_cast<QWidget *>(obj)->isEnabled(); + bool WidgetItemDelegate::isEnabled(const QObject *obj) const { + return static_cast<const QWidget *>(obj)->isEnabled(); } - bool WidgetItemDelegate::isVisible(QObject *obj) const { - return static_cast<QWidget *>(obj)->isVisible(); + bool WidgetItemDelegate::isVisible(const QObject *obj) const { + return static_cast<const QWidget *>(obj)->isVisible(); } QRect WidgetItemDelegate::mapGeometryToScene(const QObject *obj) const { @@ -32,11 +32,11 @@ } QWindow *WidgetItemDelegate::hostWindow(QObject *host) const { - return static_cast<QWidget *>(host)->windowHandle(); + return static_cast<const QWidget *>(host)->windowHandle(); } - bool WidgetItemDelegate::isHostSizeFixed(QObject *host) const { - const auto widget = static_cast<QWidget *>(host); + 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; @@ -49,25 +49,28 @@ } // Usually set by the user. const QSizePolicy sizePolicy = widget->sizePolicy(); - if ((sizePolicy.horizontalPolicy() == QSizePolicy::Fixed) - && (sizePolicy.verticalPolicy() == QSizePolicy::Fixed)) { + if ((sizePolicy.horizontalPolicy() == QSizePolicy::Fixed) && + (sizePolicy.verticalPolicy() == QSizePolicy::Fixed)) { return true; } return false; } - bool WidgetItemDelegate::resetQtGrabbedControl() const { - if (qt_button_down) { - static constexpr const auto invalidPos = QPoint{-99999, -99999}; - const auto event = - new QMouseEvent(QEvent::MouseButtonRelease, invalidPos, invalidPos, invalidPos, - Qt::LeftButton, QGuiApplication::mouseButtons() ^ Qt::LeftButton, - QGuiApplication::keyboardModifiers()); - QApplication::postEvent(qt_button_down, event); - qt_button_down = nullptr; - return true; + bool WidgetItemDelegate::isWindowActive(const QObject *host) const { + return static_cast<const QWidget *>(host)->isActiveWindow(); + } + + void WidgetItemDelegate::resetQtGrabbedControl() const { + if (!qt_button_down) { + return; } - return false; + static constexpr const auto invalidPos = + QPoint{std::numeric_limits<int>::lowest(), std::numeric_limits<int>::lowest()}; + const auto event = new QMouseEvent( + QEvent::MouseButtonRelease, invalidPos, invalidPos, invalidPos, Qt::LeftButton, + QGuiApplication::mouseButtons() ^ Qt::LeftButton, QGuiApplication::keyboardModifiers()); + QApplication::postEvent(qt_button_down, event); + qt_button_down = nullptr; } } \ No newline at end of file -- Gitblit v1.9.1