Scrollbar: don't autohide if enabled (except on Mac)

monero-project · Dec 21, 2019 · ef4df34 · ef4df34
1 parent 500c7ec
commit ef4df34
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/MiddlePanel.qml b/MiddlePanel.qml
@@ -196,6 +196,11 @@ Rectangle {
                 anchors.topMargin: persistentSettings.customDecorations ? 60 : 10
                 anchors.bottom: parent.bottom
                 anchors.bottomMargin: persistentSettings.customDecorations ? 15 : 10
+                onActiveChanged: {
+                    if(!active && !isMac){
+                        active = true
+                    }
+                }
             }
 
             onFlickingChanged: {

diff --git a/components/StandardDialog.qml b/components/StandardDialog.qml
@@ -124,7 +124,13 @@ Rectangle {
             Flickable {
                 id: flickable
                 anchors.fill: parent
-                ScrollBar.vertical: ScrollBar { }
+                ScrollBar.vertical: ScrollBar {
+                    onActiveChanged: {
+                        if(!active && !isMac){
+                            active = true
+                        }
+                    }
+                }
                 boundsBehavior: isMac ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
 
                 TextArea.flickable: TextArea {

diff --git a/pages/settings/SettingsLog.qml b/pages/settings/SettingsLog.qml
@@ -150,6 +150,7 @@ Rectangle {
             Flickable {
                 id: flickable
                 anchors.fill: parent
+                boundsBehavior: isMac ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
 
                 TextArea.flickable: TextArea {
                     id : consoleArea
@@ -203,7 +204,13 @@ Rectangle {
                     }
                 }
 
-                ScrollBar.vertical: ScrollBar {}
+                ScrollBar.vertical: ScrollBar {
+                    onActiveChanged: {
+                        if (!active && !isMac) {
+                            active = true
+                        }
+                    }
+                }
             }
         }
 

diff --git a/wizard/WizardController.qml b/wizard/WizardController.qml
@@ -277,6 +277,11 @@ Rectangle {
                 anchors.topMargin: persistentSettings.customDecorations ? 60 : 10
                 anchors.bottom: parent.bottom
                 anchors.bottomMargin: persistentSettings.customDecorations ? 15 : 10
+                onActiveChanged: {
+                    if(!active && !isMac){
+                        active = true
+                    }
+                }
             }
 
             onFlickingChanged: {