summary refs log tree commit diff
path: root/resources
diff options
context:
space:
mode:
authorDeepBlueV7.X <nicolas.werner@hotmail.de>2023-01-28 12:15:54 +0100
committerGitHub <noreply@github.com>2023-01-28 12:15:54 +0100
commit3abb49c4a2338f1d07ca68e27f3030b1a6f2a97f (patch)
tree2434425ffa8a55614e62eb4ccc8bc50c197d29c7 /resources
parentMake newline behave consistently in markdown mode (diff)
parentchore: remove button check (diff)
downloadnheko-3abb49c4a2338f1d07ca68e27f3030b1a6f2a97f.tar.xz
Merge pull request #1319 from Decodetalkers/menuhideonwayland
feat: hide all popup menus when press leftbutton on somewhere else
Diffstat (limited to 'resources')
-rw-r--r--resources/qml/MessageView.qml8
-rw-r--r--resources/qml/RoomList.qml9
-rw-r--r--resources/qml/TopBar.qml8
3 files changed, 25 insertions, 0 deletions
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;