Skip to content

Commit f578d8f

Browse files
committed
Merge #281: Only "click" setting if released within its MouseArea
0c15e1e qml: Only "click" setting if released within its MouseArea (johnny9) Pull request description: Fixes issues with pressing a setting, holding mouse down, and releasing outside of the Setting's MouseArea [![Windows](https://img.shields.io/badge/OS-Windows-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/insecure_win_gui.zip?branch=pull/281) [![Intel macOS](https://img.shields.io/badge/OS-Intel%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/insecure_mac_gui.zip?branch=pull/281) [![Apple Silicon macOS](https://img.shields.io/badge/OS-Apple%20Silicon%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos_arm64/insecure_mac_arm64_gui.zip?branch=pull/281) [![ARM64 Android](https://img.shields.io/badge/OS-Android-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/insecure_android_apk.zip?branch=pull/281) ACKs for top commit: jarolrod: ACK 0c15e1e Tree-SHA512: 3bf79c0b21042c1d80c5556ba38f49d1189104dd15b1ac434144e1950a1738503b18dab38c968a9686fe1b697f9a04a9d413e123a325f6a700d222503fb88120
2 parents aae358f + 0c15e1e commit f578d8f

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/qml/controls/Setting.qml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,12 @@ AbstractButton {
6868
root.state = "ACTIVE"
6969
}
7070
onReleased: {
71-
root.state = "HOVER"
72-
root.clicked()
71+
if (mouseArea.containsMouse) {
72+
root.state = "HOVER"
73+
root.clicked()
74+
} else {
75+
root.state = "FILLED"
76+
}
7377
}
7478
}
7579

0 commit comments

Comments
 (0)