From 9222877306f5b71293072db715512049762f1750 Mon Sep 17 00:00:00 2001
From: Hamza ARBI <hamza.arbi.15@gmail.com>
Date: Sat, 17 Dec 2022 12:06:19 +0100
Subject: [PATCH] Show Scrollbars whenever the scroll is not obvious

---
 client/ui/qml/Pages/PageAppSetting.qml      | 7 ++++++-
 client/ui/qml/Pages/PageServerList.qml      | 8 ++++++--
 client/ui/qml/Pages/PageShareConnection.qml | 1 +
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/client/ui/qml/Pages/PageAppSetting.qml b/client/ui/qml/Pages/PageAppSetting.qml
index 7e8d415a..1b0f05c0 100644
--- a/client/ui/qml/Pages/PageAppSetting.qml
+++ b/client/ui/qml/Pages/PageAppSetting.qml
@@ -29,7 +29,7 @@ PageBase {
         anchors.left: root.left
         anchors.leftMargin: 30
         anchors.right: root.right
-        anchors.rightMargin: 30
+        anchors.rightMargin: 15
 
         contentHeight: content.height
         clip: true
@@ -40,6 +40,7 @@ PageBase {
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.right: parent.right
+            anchors.rightMargin: 15
 
             CheckBoxType {
                 visible: !GC.isMobile()
@@ -161,6 +162,10 @@ PageBase {
                 }
             }
         }
+
+        ScrollBar.vertical: ScrollBar {
+            policy: fl.height > content.height? ScrollBar.AlwaysOff : ScrollBar.AlwaysOn
+        }
     }
 
     Logo {
diff --git a/client/ui/qml/Pages/PageServerList.qml b/client/ui/qml/Pages/PageServerList.qml
index de6f90ab..7791cc05 100644
--- a/client/ui/qml/Pages/PageServerList.qml
+++ b/client/ui/qml/Pages/PageServerList.qml
@@ -38,7 +38,7 @@ PageBase {
         x: 20
         anchors.top: caption.bottom
         anchors.topMargin: 15
-        width: parent.width
+        width: parent.width - 30
         anchors.bottom: parent.bottom
         anchors.bottomMargin: 20
         model: ServerListLogic.serverListModel
@@ -49,7 +49,7 @@ PageBase {
         clip: true
         delegate: Item {
             height: 60
-            width: root.width - 40
+            width: listWidget_servers.width - 15
             MouseArea {
                 id: ms
                 anchors.fill: parent
@@ -174,5 +174,9 @@ PageBase {
                 }
             }
         }
+
+        ScrollBar.vertical: ScrollBar {
+            policy: ScrollBar.AlwaysOn
+        }
     }
 }
diff --git a/client/ui/qml/Pages/PageShareConnection.qml b/client/ui/qml/Pages/PageShareConnection.qml
index 9bd84bdd..b643a7ee 100644
--- a/client/ui/qml/Pages/PageShareConnection.qml
+++ b/client/ui/qml/Pages/PageShareConnection.qml
@@ -34,6 +34,7 @@ PageBase {
         anchors.top: caption.bottom
         anchors.bottom: root.bottom
         contentHeight: col.height
+        boundsBehavior: Flickable.StopAtBounds
 
         Column {
             id: col