diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-12-21 18:15:09 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-12-21 18:15:09 -0500 |
| commit | 5c801ec2ad62e918d7e8330706f64f81482409c3 (patch) | |
| tree | f266baccacce28e0c71b13bd0533a7ed0d627bd1 | |
| parent | 7f324fb3e6a66d19350d9de22333ae557f91a3a3 (diff) | |
| parent | ded0a4da48922805c44fc2b5a06e2fe1304221bb (diff) | |
| download | monzero-gui-5c801ec2ad62e918d7e8330706f64f81482409c3.tar.gz monzero-gui-5c801ec2ad62e918d7e8330706f64f81482409c3.tar.xz monzero-gui-5c801ec2ad62e918d7e8330706f64f81482409c3.zip | |
Merge pull request #2674
ded0a4d Scrollbar: don't autohide if enabled (except on Mac) (tobtoht)
| -rw-r--r-- | MiddlePanel.qml | 1 | ||||
| -rw-r--r-- | components/StandardDialog.qml | 4 | ||||
| -rw-r--r-- | pages/settings/SettingsLog.qml | 5 | ||||
| -rw-r--r-- | wizard/WizardController.qml | 1 |
4 files changed, 9 insertions, 2 deletions
diff --git a/MiddlePanel.qml b/MiddlePanel.qml index fd3406d2..28255c8b 100644 --- a/MiddlePanel.qml +++ b/MiddlePanel.qml @@ -196,6 +196,7 @@ 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 index 2db02abb..38f0d369 100644 --- a/components/StandardDialog.qml +++ b/components/StandardDialog.qml @@ -124,7 +124,9 @@ 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 index 48fbe195..9c710ffd 100644 --- 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,9 @@ Rectangle { } } - ScrollBar.vertical: ScrollBar {} + ScrollBar.vertical: ScrollBar { + onActiveChanged: if (!active && !isMac) active = true + } } } diff --git a/wizard/WizardController.qml b/wizard/WizardController.qml index ddda6209..78cc4357 100644 --- a/wizard/WizardController.qml +++ b/wizard/WizardController.qml @@ -275,6 +275,7 @@ Rectangle { anchors.topMargin: persistentSettings.customDecorations ? 60 : 10 anchors.bottom: parent.bottom anchors.bottomMargin: persistentSettings.customDecorations ? 15 : 10 + onActiveChanged: if (!active && !isMac) active = true } onFlickingChanged: { |