diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2021-07-31 11:04:47 +0200 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@hotmail.de> | 2021-07-31 11:08:52 +0200 |
| commit | 5b0bd26795abdf222d0cfd3e5ee3cf8e8b41a9c9 (patch) | |
| tree | 9a1150352a407d5038904d5e10bbd8e3629eb6d0 /resources | |
| parent | Merge pull request #655 from LorenDB/qml-all-the-things (diff) | |
| download | nheko-5b0bd26795abdf222d0cfd3e5ee3cf8e8b41a9c9.tar.xz | |
Fix annoying touch overlap in room list
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/qml/MessageView.qml | 4 | ||||
| -rw-r--r-- | resources/qml/RoomList.qml | 43 |
2 files changed, 27 insertions, 20 deletions
diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml index b6f2b909..9ba5e2d0 100644 --- a/resources/qml/MessageView.qml +++ b/resources/qml/MessageView.qml @@ -212,9 +212,9 @@ ScrollView { // force current read index to update onTriggered: { - if (chat.model) { + if (chat.model) chat.model.setCurrentIndex(chat.model.currentIndex); - } + } interval: 1000 } 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 { |