From 5b0bd26795abdf222d0cfd3e5ee3cf8e8b41a9c9 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sat, 31 Jul 2021 11:04:47 +0200 Subject: Fix annoying touch overlap in room list --- resources/qml/RoomList.qml | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) (limited to 'resources/qml/RoomList.qml') diff --git a/resources/qml/RoomList.qml b/resources/qml/RoomList.qml index a2e50fab..695b08f3 100644 --- a/resources/qml/RoomList.qml +++ b/resources/qml/RoomList.qml @@ -172,31 +172,38 @@ Page { } ] - 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 | DeviceType.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 | DeviceType.TouchPad + } - margin: -Nheko.paddingSmall } RowLayout { -- cgit 1.5.1 From 4c151cc3c7a6722930ea2b957d63204dd62b15ed Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sat, 31 Jul 2021 15:59:19 +0200 Subject: Fix C&P error for DeviceType --- resources/qml/RoomList.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'resources/qml/RoomList.qml') diff --git a/resources/qml/RoomList.qml b/resources/qml/RoomList.qml index 695b08f3..cbc65fc0 100644 --- a/resources/qml/RoomList.qml +++ b/resources/qml/RoomList.qml @@ -185,7 +185,7 @@ Page { } gesturePolicy: TapHandler.ReleaseWithinBounds - acceptedDevices: PointerDevice.Mouse | PointerDevice.Stylus | DeviceType.TouchPad + acceptedDevices: PointerDevice.Mouse | PointerDevice.Stylus | PointerDevice.TouchPad } TapHandler { @@ -201,7 +201,7 @@ Page { HoverHandler { id: hovered - acceptedDevices: PointerDevice.Mouse | PointerDevice.Stylus | DeviceType.TouchPad + acceptedDevices: PointerDevice.Mouse | PointerDevice.Stylus | PointerDevice.TouchPad } } -- cgit 1.5.1 From f7d1d1b9416248bb75bbacc3fa14356a3acc9f24 Mon Sep 17 00:00:00 2001 From: Loren Burkholder Date: Tue, 3 Aug 2021 07:20:36 -0400 Subject: Open profile when clicking avatar --- resources/qml/RoomList.qml | 1 + 1 file changed, 1 insertion(+) (limited to 'resources/qml/RoomList.qml') diff --git a/resources/qml/RoomList.qml b/resources/qml/RoomList.qml index cbc65fc0..98532606 100644 --- a/resources/qml/RoomList.qml +++ b/resources/qml/RoomList.qml @@ -439,6 +439,7 @@ Page { 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 { -- cgit 1.5.1