monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-16 15:58:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2674

Browse source 
ded0a4d Scrollbar: don't autohide if enabled (except on Mac) (tobtoht)
This commit is contained in:
luigi1111 2019-12-21 18:15:09 -05:00
commit 5c801ec2ad
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
4 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
MiddlePanel.qml
View file

@ -196,6 +196,7 @@ Rectangle {
anchors.topMargin: persistentSettings.customDecorations ? 60 : 10 anchors.topMargin: persistentSettings.customDecorations ? 60 : 10
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.bottomMargin: persistentSettings.customDecorations ? 15 : 10 anchors.bottomMargin: persistentSettings.customDecorations ? 15 : 10
onActiveChanged: if (!active && !isMac) active = true
} }
onFlickingChanged: { onFlickingChanged: {

4
components/StandardDialog.qml
View file

@ -124,7 +124,9 @@ Rectangle {
Flickable { Flickable {
id: flickable id: flickable
anchors.fill: parent anchors.fill: parent
ScrollBar.vertical: ScrollBar { } ScrollBar.vertical: ScrollBar {
onActiveChanged: if (!active && !isMac) active = true
}
boundsBehavior: isMac ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds boundsBehavior: isMac ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
TextArea.flickable: TextArea { TextArea.flickable: TextArea {

5
pages/settings/SettingsLog.qml
View file

@ -150,6 +150,7 @@ Rectangle {
Flickable { Flickable {
id: flickable id: flickable
anchors.fill: parent anchors.fill: parent
boundsBehavior: isMac ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
TextArea.flickable: TextArea { TextArea.flickable: TextArea {
id : consoleArea id : consoleArea
@ -203,7 +204,9 @@ Rectangle {
} }
} }
ScrollBar.vertical: ScrollBar {} ScrollBar.vertical: ScrollBar {
onActiveChanged: if (!active && !isMac) active = true
}
} }
} }

1
wizard/WizardController.qml
View file

@ -275,6 +275,7 @@ Rectangle {
anchors.topMargin: persistentSettings.customDecorations ? 60 : 10 anchors.topMargin: persistentSettings.customDecorations ? 60 : 10
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.bottomMargin: persistentSettings.customDecorations ? 15 : 10 anchors.bottomMargin: persistentSettings.customDecorations ? 15 : 10
onActiveChanged: if (!active && !isMac) active = true
} }
onFlickingChanged: { onFlickingChanged: {