Skip to content

Commit ecf7145

Browse files
committed
Merge #258: Fix sizing, add background to OnboardingCover info icon button
f025b22 qml: correct color & add background for OnboardingCover info icon (jarolrod) df0104b qml: allow to specify icon color in icon button for NavButton (jarolrod) b3938cc qml: allow to specify background for icon button in NavButton (jarolrod) c32f93b qml: fix sizing of info and gear icon used in navbar buttons (jarolrod) Pull request description: This fixes the sizing for both the info and gear icon used as NavButtons in OnboardingCover and NodeSettings. The screenshots below add a red rectangle to the background of these icons to clearly show what their dimensions are: ### master | info | gear | | ---- | ---- | | <img width="150" alt="info-master" src="https://user-images.githubusercontent.com/23396902/218290267-c2abd2db-6952-43dd-a7e9-a2d7a9a17243.png"> | <img width="150" alt="gear-master" src="https://user-images.githubusercontent.com/23396902/218290285-d8c32368-a2a0-4b70-928b-753e632ddafe.png"> | ### pr | info | gear | | ---- | ---- | | <img width="150" alt="info-pr" src="https://user-images.githubusercontent.com/23396902/218290394-7d97c07b-f7a7-4133-82a7-2b6c4ef62e72.png"> | <img width="150" alt="gear-pr" src="https://user-images.githubusercontent.com/23396902/218290405-dba088ce-de0d-41bc-9066-11ae827fd624.png"> | And also adds a circle as a background for the info icon used in OnboardingCover as specified in the [design file](https://www.figma.com/file/ek8w3n3upbluw5UL2lGhRx/Bitcoin-Core-App-Design?node-id=3288%3A70698&t=TcsZHjnnq01uAQEK-4) | light | dark | | ----- | ------ | | <img width="150" alt="Screen Shot 2023-02-11 at 8 04 19 PM" src="https://user-images.githubusercontent.com/23396902/218290602-87412816-753d-441c-9038-16cfe7ea7edf.png"> | <img width="150" alt="Screen Shot 2023-02-11 at 8 04 32 PM" src="https://user-images.githubusercontent.com/23396902/218290615-3c3aa09a-c8c2-4de9-8c8c-1299365ba21f.png"> | [![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/258) [![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/258) [![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/258) [![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/258) ACKs for top commit: johnny9: ACK f025b22 Tree-SHA512: 172a4820b8ae149f802e13713038c9ccbc9238f6ea7237265e0beb3b5749da6aa835d45417ed57b9dead1fd26e36d979ddba153d7b0f8466991071a3b87c95e4
2 parents 876548d + f025b22 commit ecf7145

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

src/qml/controls/NavButton.qml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ AbstractButton {
1212
property int iconWidth: 30
1313
property int textSize: 18
1414
property url iconSource: ""
15+
property Rectangle iconBackground: null
16+
property color iconColor: Theme.color.neutral9
1517

1618
padding: 0
1719
background: Rectangle {
@@ -54,10 +56,10 @@ AbstractButton {
5456
height: root.iconHeight
5557
width: root.iconWidth
5658
icon.source: root.iconSource
57-
icon.color: Theme.color.neutral9
59+
icon.color: root.iconColor
5860
icon.height: root.iconHeight
5961
icon.width: root.iconWidth
60-
background: null
62+
background: root.iconBackground
6163
}
6264
}
6365
Loader {

src/qml/pages/main.qml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ ApplicationWindow {
5353
navRightDetail: NavButton {
5454
iconSource: "image://images/gear"
5555
iconHeight: 24
56+
iconWidth: 24
5657
onClicked: node_swipe.incrementCurrentIndex()
5758
}
5859
}

src/qml/pages/onboarding/OnboardingCover.qml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ Page {
2121
navRightDetail: NavButton {
2222
iconSource: "image://images/info"
2323
iconHeight: 24
24+
iconWidth: 24
25+
iconColor: Theme.color.neutral0
26+
iconBackground: Rectangle {
27+
radius: 12
28+
color: Theme.color.neutral9
29+
}
2430
onClicked: {
2531
introductions.incrementCurrentIndex()
2632
}

0 commit comments

Comments
 (0)