From ce22cbbabef029fba69a73e23b99c576e919645e Mon Sep 17 00:00:00 2001 From: Andreas Traczyk Date: Tue, 15 Jun 2021 13:46:11 -0400 Subject: [PATCH] misc: use ScrollBar instead of ScrollIndicator for scroll areas Interactive scroll areas with long lists should have a scroll bar to grab in order to accelerate the scroll process. Gitlab: #457 Change-Id: I24fe7d4f4f3cdda13432a6ac713bbe5bee5132f7 --- src/commoncomponents/ListViewJami.qml | 2 +- src/commoncomponents/SettingParaCombobox.qml | 2 +- src/mainview/components/AccountComboBoxPopup.qml | 2 +- src/mainview/components/CallActionBar.qml | 4 ++-- src/mainview/components/CallButtonDelegate.qml | 2 +- src/mainview/components/ConversationListView.qml | 2 +- src/mainview/components/ParticipantCallInStatusView.qml | 2 +- src/mainview/components/PluginHandlerPicker.qml | 2 +- src/settingsview/SettingsView.qml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/commoncomponents/ListViewJami.qml b/src/commoncomponents/ListViewJami.qml index 2ad1f62f..ca0bbfdc 100644 --- a/src/commoncomponents/ListViewJami.qml +++ b/src/commoncomponents/ListViewJami.qml @@ -46,6 +46,6 @@ Rectangle { clip: true maximumFlickVelocity: 1024 - ScrollIndicator.vertical: ScrollIndicator {} + ScrollBar.vertical: ScrollBar { } } } diff --git a/src/commoncomponents/SettingParaCombobox.qml b/src/commoncomponents/SettingParaCombobox.qml index 3a93ad7b..f7aede36 100644 --- a/src/commoncomponents/SettingParaCombobox.qml +++ b/src/commoncomponents/SettingParaCombobox.qml @@ -122,7 +122,7 @@ ComboBox { model: root.delegateModel currentIndex: root.highlightedIndex - ScrollIndicator.vertical: ScrollIndicator { } + ScrollBar.vertical: ScrollBar { } } background: Rectangle { diff --git a/src/mainview/components/AccountComboBoxPopup.qml b/src/mainview/components/AccountComboBoxPopup.qml index 8a9cf094..7e499b0b 100644 --- a/src/mainview/components/AccountComboBoxPopup.qml +++ b/src/mainview/components/AccountComboBoxPopup.qml @@ -67,7 +67,7 @@ Popup { } } - ScrollIndicator.vertical: ScrollIndicator {} + ScrollBar.vertical: ScrollBar { } } // fake footer item as workaround for Qt 5.15 bug diff --git a/src/mainview/components/CallActionBar.qml b/src/mainview/components/CallActionBar.qml index 98809ddf..31344199 100644 --- a/src/mainview/components/CallActionBar.qml +++ b/src/mainview/components/CallActionBar.qml @@ -461,7 +461,7 @@ Control { null delegate: buttonDelegate - ScrollIndicator.vertical: ScrollIndicator {} + ScrollBar.vertical: ScrollBar { } add: Transition { NumberAnimation { @@ -491,7 +491,7 @@ Control { overflowButton.delegateModel : null - ScrollIndicator.vertical: ScrollIndicator {} + ScrollBar.vertical: ScrollBar { } } background: Rectangle { diff --git a/src/mainview/components/CallButtonDelegate.qml b/src/mainview/components/CallButtonDelegate.qml index c636b516..08890551 100644 --- a/src/mainview/components/CallButtonDelegate.qml +++ b/src/mainview/components/CallButtonDelegate.qml @@ -254,7 +254,7 @@ ItemDelegate { implicitWidth: menuItemWidth implicitHeight: Math.min(contentHeight, menuItemHeight * 6) + 24 - ScrollIndicator.vertical: ScrollIndicator {} + ScrollBar.vertical: ScrollBar { } clip: true diff --git a/src/mainview/components/ConversationListView.qml b/src/mainview/components/ConversationListView.qml index ebfd4216..c69949fc 100644 --- a/src/mainview/components/ConversationListView.qml +++ b/src/mainview/components/ConversationListView.qml @@ -38,7 +38,7 @@ ListView { clip: true maximumFlickVelocity: 1024 - ScrollIndicator.vertical: ScrollIndicator {} + ScrollBar.vertical: ScrollBar { } // highlight selection // down and hover states are done within the delegate diff --git a/src/mainview/components/ParticipantCallInStatusView.qml b/src/mainview/components/ParticipantCallInStatusView.qml index 81790813..b8658eae 100644 --- a/src/mainview/components/ParticipantCallInStatusView.qml +++ b/src/mainview/components/ParticipantCallInStatusView.qml @@ -56,5 +56,5 @@ ListView { clip: true maximumFlickVelocity: 1024 - ScrollIndicator.vertical: ScrollIndicator {} + ScrollBar.vertical: ScrollBar { } } diff --git a/src/mainview/components/PluginHandlerPicker.qml b/src/mainview/components/PluginHandlerPicker.qml index 84dc5164..f7f2ef73 100644 --- a/src/mainview/components/PluginHandlerPicker.qml +++ b/src/mainview/components/PluginHandlerPicker.qml @@ -170,7 +170,7 @@ Popup { } } - ScrollIndicator.vertical: ScrollIndicator {} + ScrollBar.vertical: ScrollBar { } } } } diff --git a/src/settingsview/SettingsView.qml b/src/settingsview/SettingsView.qml index 775f581f..75e783ac 100644 --- a/src/settingsview/SettingsView.qml +++ b/src/settingsview/SettingsView.qml @@ -172,7 +172,7 @@ Rectangle { width: settingsViewRect.width maximumFlickVelocity: 1024 - ScrollIndicator.vertical: ScrollIndicator {} + ScrollBar.vertical: ScrollBar { } clip: true contentHeight: rightSettingsStackLayout.height