From c8d1f32e761e1520084edbcda625c8390ed6cce8 Mon Sep 17 00:00:00 2001
From: Mahmoud Badri <mahmoud.badri@qt.io>
Date: Tue, 31 Aug 2021 15:43:48 +0300
Subject: [PATCH] QmlDesigner: Improve Welcome screen scollbar

- scroll bar only visible when needed
- change color when active
- remove useless stuff
- remove 3 warnings

Change-Id: I0fbab4ca574c060f85adb0d5b6b54381337a7eae
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../qml/welcomepage/CustomScrollBar.qml           | 15 ++++++---------
 .../qml/welcomepage/CustomScrollView.qml          |  5 -----
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/plugins/studiowelcome/qml/welcomepage/CustomScrollBar.qml b/src/plugins/studiowelcome/qml/welcomepage/CustomScrollBar.qml
index f372165a784..a6042e24ccf 100644
--- a/src/plugins/studiowelcome/qml/welcomepage/CustomScrollBar.qml
+++ b/src/plugins/studiowelcome/qml/welcomepage/CustomScrollBar.qml
@@ -35,23 +35,20 @@ Controls.ScrollBar {
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
                              implicitContentHeight + topPadding + bottomPadding)
 
-    padding: control.interactive ? 1 : 2
-    visible: control.policy !== Controls.ScrollBar.AlwaysOff
-    minimumSize: orientation == Qt.Horizontal ? height / width : width / height
+    padding: active ? 1 : 2
+    visible: orientation === Qt.Horizontal ? contentWidth > width : contentHeight > height
+    minimumSize: orientation === Qt.Horizontal ? height / width : width / height
 
     contentItem: Rectangle {
         implicitWidth: 13
         implicitHeight: 13
-
-        color: Constants.textDefaultColor
+        color: active ? Constants.textHoverColor : Constants.textDefaultColor
     }
 
     background: Rectangle {
         implicitWidth: 16
         implicitHeight: 16
-        color: "#2d2e30"
-        visible: control.interactive
+        color: "#3b3c3d"
+        visible: active
     }
 }
-
-
diff --git a/src/plugins/studiowelcome/qml/welcomepage/CustomScrollView.qml b/src/plugins/studiowelcome/qml/welcomepage/CustomScrollView.qml
index a440cc68aff..0fbdfa9f00f 100644
--- a/src/plugins/studiowelcome/qml/welcomepage/CustomScrollView.qml
+++ b/src/plugins/studiowelcome/qml/welcomepage/CustomScrollView.qml
@@ -33,10 +33,5 @@ Controls.ScrollView {
            x: control.mirrored ? 0 : control.width - width
            y: control.topPadding
            height: control.availableHeight
-           active: control.ScrollBar.horizontal.active
-       }
-
-       Controls.ScrollBar.horizontal: CustomScrollBar {
-           visible: false
        }
 }