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/widgets/widgetitemdelegate.cpp | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/widgets/widgetitemdelegate.cpp b/src/widgets/widgetitemdelegate.cpp index 186516d..ca8bb99 100644 --- a/src/widgets/widgetitemdelegate.cpp +++ b/src/widgets/widgetitemdelegate.cpp @@ -12,7 +12,7 @@ WidgetItemDelegate::~WidgetItemDelegate() = default; - QWindow *WidgetItemDelegate::window(const QObject *obj) const { + QWindow *WidgetItemDelegate::window(QObject *obj) const { return static_cast<const QWidget *>(obj)->windowHandle(); } @@ -31,7 +31,7 @@ return {originPoint, size}; } - QWindow *WidgetItemDelegate::hostWindow(const QObject *host) const { + QWindow *WidgetItemDelegate::hostWindow(QObject *host) const { return static_cast<const QWidget *>(host)->windowHandle(); } @@ -49,22 +49,26 @@ } // 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::isWindowActive(const QObject *host) const { + return static_cast<const QWidget *>(host)->isActiveWindow(); } void WidgetItemDelegate::resetQtGrabbedControl() const { if (!qt_button_down) { return; } - 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()); + 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; } -- Gitblit v1.9.1