Merge pull request #951 from maltee1/fix_timeline_scrollbar

Fix timeline scrollbar
This commit is contained in:
DeepBlueV7.X 2022-02-21 00:31:09 +00:00 committed by GitHub
commit b3da8738bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -23,23 +23,17 @@ Item {
ScrollBar { ScrollBar {
id: scrollbar id: scrollbar
interactive: !touchObserver.wasTouched
parent: chat.parent parent: chat.parent
anchors.top: parent.top anchors.top: parent.top
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
} }
EventObserver {
id: touchObserver
anchors.fill: parent
ListView { ListView {
id: chat id: chat
anchors.fill: parent anchors.fill: parent
property int delegateMaxWidth: ((Settings.timelineMaxWidth > 100 && Settings.timelineMaxWidth < chatRoot.availableWidth) ? Settings.timelineMaxWidth : chatRoot.availableWidth) - chatRoot.padding * 2 - scrollbar.width property int delegateMaxWidth: ((Settings.timelineMaxWidth > 100 && Settings.timelineMaxWidth < chatRoot.availableWidth) ? Settings.timelineMaxWidth : chatRoot.availableWidth) - chatRoot.padding * 2 - (scrollbar.interactive? scrollbar.width : 0)
displayMarginBeginning: height / 2 displayMarginBeginning: height / 2
displayMarginEnd: height / 2 displayMarginEnd: height / 2
@ -59,7 +53,7 @@ Item {
ScrollBar.vertical: scrollbar ScrollBar.vertical: scrollbar
anchors.rightMargin: scrollbar.interactive ? scrollbar.width : 0 anchors.rightMargin: scrollbar.interactive? scrollbar.width : 0
Rectangle { Rectangle {
//closePolicy: Popup.NoAutoClose //closePolicy: Popup.NoAutoClose
@ -570,8 +564,6 @@ Item {
} }
} }
}
} }
Platform.Menu { Platform.Menu {