Merge pull request #1319 from Decodetalkers/menuhideonwayland

feat: hide all popup menus when press leftbutton on somewhere else

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

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
 

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;

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()
 {

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();