Page MenuHomePhorge
Files F85092660

D312.1782377144.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D312.1782377144.diff
View Options

diff --git a/src/contents/ui/RoomPage.qml b/src/contents/ui/RoomPage.qml
--- a/src/contents/ui/RoomPage.qml
+++ b/src/contents/ui/RoomPage.qml
@@ -36,6 +36,7 @@
title: roomNameProvider.name
padding: 0
+ verticalScrollBarPolicy: QQC2.ScrollBar.AlwaysOff
property var isInvite: room.membership === MK.MatrixRoom.Invite
property var isJoin: room.membership === MK.MatrixRoom.Join
@@ -136,12 +137,41 @@
}
}
- RoomTimelineView {
- id: roomTimelineView
- objectName: 'roomTimelineView'
- timeline: roomPage.roomTimeline
+ RowLayout {
+ anchors.fill: parent
+ RoomTimelineView {
+ id: roomTimelineView
+ objectName: 'roomTimelineView'
+ timeline: roomPage.roomTimeline
+ Layout.fillWidth: true
+ Layout.fillHeight: true
+ }
+ ScrollBar {
+ id: scrollBar
+ Layout.fillHeight: true
+ size: Math.max(roomTimelineView.visibleArea.heightRatio, 0.05)
+
+ Binding on position {
+ when: !scrollBar.pressed
+ value: roomTimelineView.visibleArea.yPosition
+ }
+
+ Timer {
+ interval: 50
+ running: scrollBar.pressed
+ repeat: true
+ onTriggered: {
+ const va = roomTimelineView.visibleArea;
+ // scrollBar.size has a minimum of 0.05; use the actual size to rescale position
+ const maxPos = 1.0 - scrollBar.size;
+ const effectiveYPos = scrollBar.position * (1 - va.heightRatio) / maxPos;
+ roomTimelineView.contentY += (effectiveYPos - va.yPosition) * roomTimelineView.height / va.heightRatio;
+ }
+ }
+ }
}
+
onRoomChanged: {
kazvIOManager.deleteModelIfEmpty(roomId)
uploadList.model = kazvIOManager.getUploadJobs(roomId)
diff --git a/src/contents/ui/RoomTimelineView.qml b/src/contents/ui/RoomTimelineView.qml
--- a/src/contents/ui/RoomTimelineView.qml
+++ b/src/contents/ui/RoomTimelineView.qml
@@ -14,6 +14,7 @@
ListView {
id: roomTimelineView
objectName: 'roomTimelineView'
+ boundsBehavior: Flickable.StopAtBounds
property var timeline
property string selectedEventId

File Metadata

Mime Type
text/plain
Expires
Thu, Jun 25, 1:45 AM (12 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1623357
Default Alt Text
D312.1782377144.diff (2 KB)

Event Timeline