Commit 7cd989d
committed
Merge #238: Add OutlineButton interaction color animation states
f0cdf11 qml: Add OutlineButton interaction color animation states (jarolrod)
5ee9c25 qml: Address silent conflict with Header control in initerrormessage (jarolrod)
Pull request description:
Introduces the missing OutlineButton interaction color animation states as detailed in #237
| Default | Hovered | Pressed |
| ------- | ------- | ------- |
| <img width="612" alt="Screen Shot 2023-01-31 at 1 25 03 AM" src="https://user-images.githubusercontent.com/23396902/215683311-cd255b10-fe9f-4fbb-b44b-0e108d5050ea.png"> | <img width="612" alt="Screen Shot 2023-01-31 at 1 25 12 AM" src="https://user-images.githubusercontent.com/23396902/215683319-5c6f17fa-cff1-493e-866e-707d8c821738.png"> | <img width="612" alt="Screen Shot 2023-01-31 at 1 25 20 AM" src="https://user-images.githubusercontent.com/23396902/215683343-696db084-3133-48e6-b069-a43429019d22.png"> |
Closes #237
[](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/insecure_win_gui.zip?branch=pull/<PR>)
[](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/insecure_mac_gui.zip?branch=pull/<PR>)
[](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos_arm64/insecure_mac_arm64_gui.zip?branch=pull/<PR>)
[](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/insecure_android_apk.zip?branch=pull/<PR>)
ACKs for top commit:
johnny9:
ACK f0cdf11
Tree-SHA512: c1e2ed67cffab33e593e03ec675b703a97b2e5fa43e1bd7d1164031c05199a5f22716eea69111ebde99aa4f78b2e38e3f7bb7a90f3d5aebbb9df9f0cc3bbf21d2 files changed
+39
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| 9 | + | |
9 | 10 | | |
10 | 11 | | |
11 | 12 | | |
| |||
17 | 18 | | |
18 | 19 | | |
19 | 20 | | |
| 21 | + | |
20 | 22 | | |
21 | 23 | | |
22 | 24 | | |
23 | 25 | | |
| 26 | + | |
24 | 27 | | |
25 | 28 | | |
26 | | - | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
27 | 64 | | |
28 | 65 | | |
29 | 66 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| |||
0 commit comments