diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml index 6d5ee404..f8c65a8d 100644 --- a/resources/qml/MessageView.qml +++ b/resources/qml/MessageView.qml @@ -25,6 +25,14 @@ Item { property string searchString: "" + // HACK: https://bugreports.qt.io/browse/QTBUG-83972, qtwayland cannot auto hide menu + Connections { + function onHideMenu() { + messageContextMenu.close() + } + target: MainWindow + } + ScrollBar { id: scrollbar parent: chat.parent diff --git a/resources/qml/RoomList.qml b/resources/qml/RoomList.qml index 40ecdd34..348d104f 100644 --- a/resources/qml/RoomList.qml +++ b/resources/qml/RoomList.qml @@ -20,6 +20,15 @@ Page { property int avatarSize: Math.ceil(fontMetrics.lineSpacing * 2.3) property bool collapsed: false + // HACK: https://bugreports.qt.io/browse/QTBUG-83972, qtwayland cannot auto hide menu + Connections { + function onHideMenu() { + userInfoMenu.close() + roomContextMenu.close() + } + target: MainWindow + } + Component { id: roomDirectoryComponent diff --git a/resources/qml/TopBar.qml b/resources/qml/TopBar.qml index 4a52d234..23a7f149 100644 --- a/resources/qml/TopBar.qml +++ b/resources/qml/TopBar.qml @@ -30,6 +30,14 @@ Pane { property string searchString: "" + // HACK: https://bugreports.qt.io/browse/QTBUG-83972, qtwayland cannot auto hide menu + Connections { + function onHideMenu() { + roomOptionsMenu.close() + } + target: MainWindow + } + onRoomIdChanged: { searchString = ""; searchButton.searchActive = false; diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index dcb4be49..8c2b4c35 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -359,6 +359,18 @@ MainWindow::event(QEvent *event) return QQuickView::event(event); } +// HACK: https://bugreports.qt.io/browse/QTBUG-83972, qtwayland cannot auto hide menu +void +MainWindow::mousePressEvent(QMouseEvent *event) +{ +#if defined(Q_OS_LINUX) + if (QGuiApplication::platformName() == "wayland") { + emit hideMenu(); + } +#endif + return QQuickView::mousePressEvent(event); +} + void MainWindow::restoreWindowSize() { diff --git a/src/MainWindow.h b/src/MainWindow.h index 1664f849..bb23ff11 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -69,6 +69,8 @@ public: protected: void closeEvent(QCloseEvent *event); bool event(QEvent *event) override; + // HACK: https://bugreports.qt.io/browse/QTBUG-83972, qtwayland cannot auto hide menu + void mousePressEvent(QMouseEvent *) override; private slots: //! Handle interaction with the tray icon. @@ -77,6 +79,8 @@ private slots: virtual void setWindowTitle(int notificationCount); signals: + // HACK: https://bugreports.qt.io/browse/QTBUG-83972, qtwayland cannot auto hide menu + void hideMenu(); void reload(); void secretsChanged();