Skip to content

Commit 4ee8c36

Browse files
committed
qml: engage the actionItem when the Setting is clicked
When a Setting is clicked on, anywhere within its bounds, the actionItem will be engaged.
1 parent f8db323 commit 4ee8c36

File tree

5 files changed

+34
-0
lines changed

5 files changed

+34
-0
lines changed

src/qml/components/AboutOptions.qml

+5
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ ColumnLayout {
1717
link: "https://bitcoincore.org"
1818
iconSource: "image://images/caret-right"
1919
}
20+
onClicked: loadedItem.clicked()
2021
}
2122
Setting {
2223
Layout.fillWidth: true
@@ -26,6 +27,7 @@ ColumnLayout {
2627
link: "https://github.com/bitcoin/bitcoin"
2728
iconSource: "image://images/caret-right"
2829
}
30+
onClicked: loadedItem.clicked()
2931
}
3032
Setting {
3133
Layout.fillWidth: true
@@ -35,6 +37,7 @@ ColumnLayout {
3537
link: "https://opensource.org/licenses/MIT"
3638
iconSource: "image://images/caret-right"
3739
}
40+
onClicked: loadedItem.clicked()
3841
}
3942
Setting {
4043
Layout.fillWidth: true
@@ -44,6 +47,7 @@ ColumnLayout {
4447
link: "https://bitcoin.org/en/download"
4548
iconSource: "image://images/caret-right"
4649
}
50+
onClicked: loadedItem.clicked()
4751
}
4852
Setting {
4953
Layout.fillWidth: true
@@ -59,5 +63,6 @@ ColumnLayout {
5963
aboutSwipe.incrementCurrentIndex()
6064
}
6165
}
66+
onClicked: loadedItem.clicked()
6267
}
6368
}

src/qml/components/ConnectionSettings.qml

+16
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ ColumnLayout {
1717
checked: optionsModel.listen
1818
onToggled: optionsModel.listen = checked
1919
}
20+
onClicked: {
21+
loadedItem.toggle()
22+
loadedItem.toggled()
23+
}
2024
}
2125
Setting {
2226
Layout.fillWidth: true
@@ -25,6 +29,10 @@ ColumnLayout {
2529
checked: optionsModel.upnp
2630
onToggled: optionsModel.upnp = checked
2731
}
32+
onClicked: {
33+
loadedItem.toggle()
34+
loadedItem.toggled()
35+
}
2836
}
2937
Setting {
3038
Layout.fillWidth: true
@@ -33,6 +41,10 @@ ColumnLayout {
3341
checked: optionsModel.natpmp
3442
onToggled: optionsModel.natpmp = checked
3543
}
44+
onClicked: {
45+
loadedItem.toggle()
46+
loadedItem.toggled()
47+
}
3648
}
3749
Setting {
3850
Layout.fillWidth: true
@@ -41,6 +53,10 @@ ColumnLayout {
4153
checked: optionsModel.server
4254
onToggled: optionsModel.server = checked
4355
}
56+
onClicked: {
57+
loadedItem.toggle()
58+
loadedItem.toggled()
59+
}
4460
}
4561
Setting {
4662
last: true

src/qml/components/DeveloperOptions.qml

+4
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,23 @@ ColumnLayout {
1818
iconHeight: 30
1919
link: "https://bitcoin.org/en/bitcoin-core/contribute/documentation"
2020
}
21+
onClicked: loadedItem.clicked()
2122
}
2223
Setting {
2324
Layout.fillWidth: true
2425
header: qsTr("Database cache size")
2526
actionItem: ValueInput {
2627
description: ("450 MiB")
2728
}
29+
onClicked: loadedItem.forceActiveFocus()
2830
}
2931
Setting {
3032
Layout.fillWidth: true
3133
header: qsTr("Script verification threads")
3234
actionItem: ValueInput {
3335
description: ("0")
3436
}
37+
onClicked: loadedItem.forceActiveFocus()
3538
}
3639
Setting {
3740
Layout.fillWidth: true
@@ -40,5 +43,6 @@ ColumnLayout {
4043
checked: Theme.dark
4144
onToggled: Theme.toggleDark()
4245
}
46+
onClicked: loadedItem.toggled()
4347
}
4448
}

src/qml/components/StorageSettings.qml

+5
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ ColumnLayout {
1616
checked: optionsModel.prune
1717
onToggled: optionsModel.prune = checked
1818
}
19+
onClicked: {
20+
loadedItem.toggle()
21+
loadedItem.toggled()
22+
}
1923
}
2024
Setting {
2125
Layout.fillWidth: true
@@ -24,5 +28,6 @@ ColumnLayout {
2428
description: optionsModel.pruneSizeGB
2529
onEditingFinished: optionsModel.pruneSizeGB = parseInt(text)
2630
}
31+
onClicked: loadedItem.forceActiveFocus()
2732
}
2833
}

src/qml/pages/node/NodeSettings.qml

+4
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ Item {
4444
checked: Theme.dark
4545
onToggled: Theme.toggleDark()
4646
}
47+
onClicked: loadedItem.toggled()
4748
}
4849
Setting {
4950
Layout.fillWidth: true
@@ -58,6 +59,7 @@ Item {
5859
nodeSettingsView.push(about_page)
5960
}
6061
}
62+
onClicked: loadedItem.clicked()
6163
}
6264
Setting {
6365
Layout.fillWidth: true
@@ -72,6 +74,7 @@ Item {
7274
nodeSettingsView.push(storage_page)
7375
}
7476
}
77+
onClicked: loadedItem.clicked()
7578
}
7679
Setting {
7780
Layout.fillWidth: true
@@ -86,6 +89,7 @@ Item {
8689
nodeSettingsView.push(connection_page)
8790
}
8891
}
92+
onClicked: loadedItem.clicked()
8993
}
9094
}
9195
}

0 commit comments

Comments
 (0)