From a95d2e76f5a24bfbef114bf21a7c57998fdba7be Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Tue, 13 Nov 2018 18:03:53 -0800 Subject: [PATCH] Fix settings page scrolling. Fixes #106 --- app/gui/SettingsView.qml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/app/gui/SettingsView.qml b/app/gui/SettingsView.qml index 8186705a..864db054 100644 --- a/app/gui/SettingsView.qml +++ b/app/gui/SettingsView.qml @@ -5,9 +5,24 @@ import StreamingPreferences 1.0 import ComputerManager 1.0 import SdlGamepadKeyNavigation 1.0 -ScrollView { +Flickable { id: settingsPage objectName: "Settings" + anchors.fill: parent + + contentWidth: settingsColumn1.width > settingsColumn2.width ? settingsColumn1.width : settingsColumn2.width + contentHeight: settingsColumn1.height > settingsColumn2.height ? settingsColumn1.height : settingsColumn2.height + + ScrollBar.vertical: ScrollBar { + parent: settingsPage.parent + anchors { + top: settingsPage.top + left: settingsPage.right + bottom: settingsPage.bottom + + leftMargin: -10 + } + } StreamingPreferences { id: prefs