diff options
| author | kamathmanu <manuriddle@gmail.com> | 2021-08-07 21:20:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-07 21:20:43 +0000 |
| commit | 2dfccda73c44d97e9e3e52db3e03315e8ef656a5 (patch) | |
| tree | 52c9855610cbdf6f6284cfacbaba07f676a0f621 /resources/qml/RoomList.qml | |
| parent | Fix Duplicate fetched chunk (diff) | |
| parent | Show encryption errors in qml and add request keys button (diff) | |
| download | nheko-2dfccda73c44d97e9e3e52db3e03315e8ef656a5.tar.xz | |
Merge branch 'master' into nhekoRoomDirectory
Diffstat (limited to 'resources/qml/RoomList.qml')
| -rw-r--r-- | resources/qml/RoomList.qml | 44 |
1 files changed, 26 insertions, 18 deletions
diff --git a/resources/qml/RoomList.qml b/resources/qml/RoomList.qml index 31c9d3cf..e8aacf75 100644 --- a/resources/qml/RoomList.qml +++ b/resources/qml/RoomList.qml @@ -179,31 +179,38 @@ Component { } ] - TapHandler { - margin: -Nheko.paddingSmall - acceptedButtons: Qt.RightButton - onSingleTapped: { - if (!TimelineManager.isInvite) - roomContextMenu.show(roomId, tags); + // NOTE(Nico): We want to prevent the touch areas from overlapping. For some reason we need to add 1px of padding for that... + Item { + anchors.fill: parent + anchors.margins: 1 + TapHandler { + acceptedButtons: Qt.RightButton + onSingleTapped: { + if (!TimelineManager.isInvite) + roomContextMenu.show(roomId, tags); + + } + gesturePolicy: TapHandler.ReleaseWithinBounds + acceptedDevices: PointerDevice.Mouse | PointerDevice.Stylus | PointerDevice.TouchPad } - gesturePolicy: TapHandler.ReleaseWithinBounds - } - TapHandler { - margin: -Nheko.paddingSmall - onSingleTapped: Rooms.setCurrentRoom(roomId) - onLongPressed: { - if (!isInvite) - roomContextMenu.show(roomId, tags); + TapHandler { + margin: -Nheko.paddingSmall + onSingleTapped: Rooms.setCurrentRoom(roomId) + onLongPressed: { + if (!isInvite) + roomContextMenu.show(roomId, tags); + } } - } - HoverHandler { - id: hovered + HoverHandler { + id: hovered + + acceptedDevices: PointerDevice.Mouse | PointerDevice.Stylus | PointerDevice.TouchPad + } - margin: -Nheko.paddingSmall } RowLayout { @@ -439,6 +446,7 @@ Component { url: (userInfoGrid.profile ? userInfoGrid.profile.avatarUrl : "").replace("mxc://", "image://MxcImage/") displayName: userInfoGrid.profile ? userInfoGrid.profile.displayName : "" userid: userInfoGrid.profile ? userInfoGrid.profile.userid : "" + enabled: false } ColumnLayout { |