FlickableType added

client/resources.qrc

@@ -160,5 +160,6 @@
         <file>ui/qml/Pages/PageQrDecoderIos.qml</file>
         <file>server_scripts/website_tor/Dockerfile</file>
         <file>ui/qml/Pages/PageViewConfig.qml</file>
+        <file>ui/qml/Controls/FlickableType.qml</file>
     </qresource>
 </RCC>

client/ui/qml/Controls/FlickableType.qml

@@ -0,0 +1,14 @@
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+
+Flickable {
+    id: fl
+
+    Keys.onUpPressed: scrollBar.decrease()
+    Keys.onDownPressed: scrollBar.increase()
+
+    ScrollBar.vertical: ScrollBar {
+        id: scrollBar
+        policy: fl.height > fl.contentHeight ? ScrollBar.AlwaysOff : ScrollBar.AlwaysOn
+    }
+}

client/ui/qml/Pages/InstallSettings/SelectContainer.qml

@@ -50,7 +50,7 @@ Drawer {
 
     }
 
-    Flickable {
+    FlickableType {
         clip: true
         anchors.fill: parent
         contentHeight: col.height

client/ui/qml/Pages/PageAppSetting.qml

@@ -19,7 +19,7 @@ PageBase {
         text: qsTr("Application Settings")
     }
 
-    Flickable {
+    FlickableType {
         id: fl
         width: root.width
         anchors.top: caption.bottom
@@ -162,10 +162,6 @@ PageBase {
                 }
             }
         }
-
-        ScrollBar.vertical: ScrollBar {
-            policy: fl.height > content.height? ScrollBar.AlwaysOff : ScrollBar.AlwaysOn
-        }
     }
 
     Logo {

client/ui/qml/Pages/PageGeneralSettings.qml

@@ -17,7 +17,7 @@ PageBase {
         z: -1
     }
 
-    Flickable {
+    FlickableType {
         id: fl
         width: root.width
         anchors.top: back.bottom

client/ui/qml/Pages/PageServerContainers.qml

@@ -178,7 +178,7 @@ PageBase {
 
 
 
-    Flickable {
+    FlickableType {
         visible: container_selector.selectedIndex <= 0
         clip: true
         width: parent.width

client/ui/qml/Pages/PageServerList.qml

@@ -176,7 +176,7 @@ PageBase {
         }
 
         ScrollBar.vertical: ScrollBar {
-            policy: ScrollBar.AlwaysOn
+            policy: ScrollBar.AsNeeded
         }
     }
 }

client/ui/qml/Pages/PageSetupWizard.qml

@@ -19,7 +19,7 @@ PageBase {
         text: qsTr("Setup your server to use VPN")
     }
 
-    Flickable {
+    FlickableType {
         id: fl
         width: root.width
         anchors.top: caption.bottom

client/ui/qml/Pages/PageSetupWizardHighLevel.qml

@@ -19,7 +19,7 @@ PageBase {
         text: qsTr("Setup Wizard")
     }
 
-    Flickable {
+    FlickableType {
         id: fl
         width: root.width
         anchors.top: caption.bottom

client/ui/qml/Pages/PageSetupWizardLowLevel.qml

@@ -19,7 +19,7 @@ PageBase {
         text: qsTr("Setup Wizard")
     }
 
-    Flickable {
+    FlickableType {
         id: fl
         width: root.width
         anchors.top: caption.bottom

client/ui/qml/Pages/PageSetupWizardMediumLevel.qml

@@ -19,7 +19,7 @@ PageBase {
         text: qsTr("Setup Wizard")
     }
 
-    Flickable {
+    FlickableType {
         id: fl
         width: root.width
         anchors.top: caption.bottom

client/ui/qml/Pages/PageSetupWizardVPNMode.qml

@@ -19,7 +19,7 @@ PageBase {
         text: qsTr("Setup Wizard")
     }
 
-    Flickable {
+    FlickableType {
         id: fl
         width: root.width
         anchors.top: caption.bottom

client/ui/qml/Pages/PageShareConnection.qml

@@ -28,7 +28,7 @@ PageBase {
     }
 
 
-    Flickable {
+    FlickableType {
         clip: true
         width: parent.width
         anchors.top: caption.bottom

client/ui/qml/Pages/PageViewConfig.qml

@@ -20,7 +20,7 @@ PageBase {
         text: qsTr("Check config")
     }
 
-    Flickable {
+    FlickableType {
         id: fl
         width: root.width
         anchors.top: caption.bottom

client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml

@@ -19,7 +19,7 @@ PageProtocolBase {
         text: qsTr("OpenVPN Settings")
     }
 
-    Flickable {
+    FlickableType {
         id: fl
         width: root.width
         anchors.top: caption.bottom

client/ui/qml/Pages/Share/PageShareProtoAmnezia.qml

@@ -18,7 +18,7 @@ PageShareProtocolBase {
         text: qsTr("Share for Amnezia")
     }
 
-    Flickable {
+    FlickableType {
         id: fl
         width: root.width
         anchors.top: caption.bottom

client/ui/qml/Pages/Share/PageShareProtoCloak.qml

@@ -18,7 +18,7 @@ PageShareProtocolBase {
         text: qsTr("Share Cloak Settings")
     }
 
-    Flickable {
+    FlickableType {
         id: fl
         width: root.width
         anchors.top: caption.bottom

client/ui/qml/Pages/Share/PageShareProtoIkev2.qml

@@ -42,7 +42,7 @@ PageShareProtocolBase {
         visible: false
     }
 
-    Flickable {
+    FlickableType {
         id: fl
         width: root.width
         anchors.top: caption.bottom

client/ui/qml/Pages/Share/PageShareProtoOpenVPN.qml

@@ -18,7 +18,7 @@ PageShareProtocolBase {
         text: qsTr("Share OpenVPN Settings")
     }
 
-    Flickable {
+    FlickableType {
         id: fl
         width: root.width
         anchors.top: caption.bottom

client/ui/qml/Pages/Share/PageShareProtoShadowSocks.qml

@@ -18,7 +18,7 @@ PageShareProtocolBase {
         text: qsTr("Share ShadowSocks Settings")
     }
 
-    Flickable {
+    FlickableType {
         id: fl
         width: root.width
         anchors.top: caption.bottom

client/ui/qml/Pages/Share/PageShareProtoWireGuard.qml

@@ -18,7 +18,7 @@ PageShareProtocolBase {
         text: qsTr("Share WireGuard Settings")
     }
 
-    Flickable {
+    FlickableType {
         id: fl
         width: root.width
         anchors.top: caption.bottom