Constrain Options views to 450 pixels plus padding#185
Merged
Conversation
Collaborator
Author
|
PR
|
jarolrod
reviewed
Nov 8, 2022
Contributor
There was a problem hiding this comment.
Master
Desktop
| About | Developer Options | Storage Settings | Connection Settings |
|---|---|---|---|
 |
 |
 |
 |
Android Phone
Portrait
| About | Developer Options | Storage Settings | Connection Settings |
|---|---|---|---|
 |
 |
 |
 |
Horizontal
| About | Developer Options |
|---|---|
 |
 |
| Storage Settings | Connection Settings |
|---|---|
 |
 |
Android Tablet
Portrait
| About | Developer Options | Storage Settings | Connection Settings |
|---|---|---|---|
 |
 |
 |
 |
Horizontal
| About | Developer Options |
|---|---|
 |
 |
| Storage Settings | Connection Settings |
|---|---|
 |
 |
Pull Request
Desktop
| About | Developer Options | Storage Settings | Connection Settings |
|---|---|---|---|
 |
 |
 |
 |
Android Phone
Portrait
| About | Developer Options | Storage Settings | Connection Settings |
|---|---|---|---|
 |
 |
 |
 |
Horizontal
| About | Developer Options |
|---|---|
 |
 |
| Storage Settings | Connection Settings |
|---|---|
 |
 |
Android Tablet
Portrait
| About | Developer Options | Storage Settings | Connection Settings |
|---|---|---|---|
 |
 |
 |
 |
Horizontal
| About | Developer Options |
|---|---|
 |
 |
| Storage Settings | Connection Settings |
|---|---|
 |
 |
hebasto
added a commit
that referenced
this pull request
Dec 8, 2022
b954e9f qml: use the OnboardingInfo control for onboarding settings views (jarolrod) 325099d qml: make continueButton text optional in the OnboardingInfo control (jarolrod) Pull request description: This PR reworks the `OnboardingInfo` control so that we can use it for *all* onboarding pages. The `OnboardingInfo` control doesn't work for the onboarding pages which represent the advanced settings views because the `OnboardingInfo` control always shows the continue button, which the advanced settings views do not use. We get around this here by making the buttonText value optional, making it so that the ContinueButton is not visible or enabled when the continueText value is not specified. Additionally, this now changes the way that we fix the issue shown in #185. Instead of setting a maxwidth or 490 for the content, we give the `Setting` control an implicitWidth of 450. This is necessary in order to accommodate this change as we will no longer have an independent Header control which stretches out the width. ## Desktop ### master | a | b | c | d | | - | - | - | - | | <img width="752" alt="Screen Shot 2022-11-23 at 1 40 14 AM" src="https://user-images.githubusercontent.com/23396902/203560540-8766703f-f214-4d0c-bc07-27ae1fd244c8.png"> | <img width="752" alt="Screen Shot 2022-11-23 at 1 40 26 AM" src="https://user-images.githubusercontent.com/23396902/203560559-a58ff346-11be-4da4-8dbd-8f08adae7a7b.png"> | <img width="752" alt="Screen Shot 2022-11-23 at 1 40 40 AM" src="https://user-images.githubusercontent.com/23396902/203560582-582f404f-2c47-4609-9ac8-9b71c44567ef.png"> | <img width="752" alt="Screen Shot 2022-11-23 at 1 40 52 AM" src="https://user-images.githubusercontent.com/23396902/203560606-b04738c7-3e1a-4e77-a612-524bf85e58c1.png"> | ### pr | a | b | c | d | | - | - | - | - | | <img width="752" alt="Screen Shot 2022-11-23 at 2 56 48 AM" src="https://user-images.githubusercontent.com/23396902/203560246-fd2137f3-8172-4fdb-9df9-fc7278777303.png"> | <img width="752" alt="Screen Shot 2022-11-23 at 2 56 55 AM" src="https://user-images.githubusercontent.com/23396902/203560306-3c4b064a-0054-4e0f-bfab-bddba5496a27.png"> | <img width="752" alt="Screen Shot 2022-11-23 at 2 57 10 AM" src="https://user-images.githubusercontent.com/23396902/203560333-0c962a39-9a52-4388-acdd-95ee517401db.png"> | <img width="752" alt="Screen Shot 2022-11-23 at 2 57 21 AM" src="https://user-images.githubusercontent.com/23396902/203560402-f54cb352-89df-4f33-8bc4-46021efcc52c.png"> | [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/insecure_win_gui.zip?branch=pull/192) [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/insecure_mac_gui.zip?branch=pull/192) [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos_arm64/insecure_mac_arm64_gui.zip?branch=pull/192) [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/insecure_android_apk.zip?branch=pull/192) ACKs for top commit: johnny9: ACK b954e9f Tree-SHA512: d82bb4f20bfe65cfb45fb19b0cbbcd16f31500df0ca3a132c473245677a6b66264a21a756abbc89589cac610fd7e075813637ffa6a659b8729735d341d5805bd
hebasto
pushed a commit
to hebasto/gui-qml
that referenced
this pull request
Jun 8, 2025
Github-Pull: bitcoin-core#185 Rebased-From: 595a57d
hebasto
pushed a commit
to hebasto/gui-qml
that referenced
this pull request
Jun 9, 2025
Github-Pull: bitcoin-core#185 Rebased-From: 595a57d
hebasto
pushed a commit
to hebasto/gui-qml
that referenced
this pull request
Jun 9, 2025
Github-Pull: bitcoin-core#185 Rebased-From: 595a57d
johnny9
pushed a commit
to johnny9/bitcoin-core-app
that referenced
this pull request
Jul 4, 2025
… plus padding 7009c44 qml: constrain Options views to 450 pixels plus padding (Johnny Carlson) Pull request description: ACKs for top commit: jarolrod: ACK 7009c44 Tree-SHA512: 15abd073cba1f1fdfed9c781d9cd346a38f38c7e5eb5d02b0fb818ae81156ade196abfb352a4a0caba4d98da98453d8ddef37c11052ffa06b93742c74275fa22
johnny9
pushed a commit
to johnny9/bitcoin-core-app
that referenced
this pull request
Jul 4, 2025
… pages 79af12b qml: use the OnboardingInfo control for onboarding settings views (jarolrod) 9c330e7 qml: make continueButton text optional in the OnboardingInfo control (jarolrod) Pull request description: This PR reworks the `OnboardingInfo` control so that we can use it for *all* onboarding pages. The `OnboardingInfo` control doesn't work for the onboarding pages which represent the advanced settings views because the `OnboardingInfo` control always shows the continue button, which the advanced settings views do not use. We get around this here by making the buttonText value optional, making it so that the ContinueButton is not visible or enabled when the continueText value is not specified. Additionally, this now changes the way that we fix the issue shown in bitcoin-core/gui-qml#185. Instead of setting a maxwidth or 490 for the content, we give the `Setting` control an implicitWidth of 450. This is necessary in order to accommodate this change as we will no longer have an independent Header control which stretches out the width. ## Desktop ### master | a | b | c | d | | - | - | - | - | | <img width="752" alt="Screen Shot 2022-11-23 at 1 40 14 AM" src="https://user-images.githubusercontent.com/23396902/203560540-8766703f-f214-4d0c-bc07-27ae1fd244c8.png"> | <img width="752" alt="Screen Shot 2022-11-23 at 1 40 26 AM" src="https://user-images.githubusercontent.com/23396902/203560559-a58ff346-11be-4da4-8dbd-8f08adae7a7b.png"> | <img width="752" alt="Screen Shot 2022-11-23 at 1 40 40 AM" src="https://user-images.githubusercontent.com/23396902/203560582-582f404f-2c47-4609-9ac8-9b71c44567ef.png"> | <img width="752" alt="Screen Shot 2022-11-23 at 1 40 52 AM" src="https://user-images.githubusercontent.com/23396902/203560606-b04738c7-3e1a-4e77-a612-524bf85e58c1.png"> | ### pr | a | b | c | d | | - | - | - | - | | <img width="752" alt="Screen Shot 2022-11-23 at 2 56 48 AM" src="https://user-images.githubusercontent.com/23396902/203560246-fd2137f3-8172-4fdb-9df9-fc7278777303.png"> | <img width="752" alt="Screen Shot 2022-11-23 at 2 56 55 AM" src="https://user-images.githubusercontent.com/23396902/203560306-3c4b064a-0054-4e0f-bfab-bddba5496a27.png"> | <img width="752" alt="Screen Shot 2022-11-23 at 2 57 10 AM" src="https://user-images.githubusercontent.com/23396902/203560333-0c962a39-9a52-4388-acdd-95ee517401db.png"> | <img width="752" alt="Screen Shot 2022-11-23 at 2 57 21 AM" src="https://user-images.githubusercontent.com/23396902/203560402-f54cb352-89df-4f33-8bc4-46021efcc52c.png"> | [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/insecure_win_gui.zip?branch=pull/192) [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/insecure_mac_gui.zip?branch=pull/192) [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos_arm64/insecure_mac_arm64_gui.zip?branch=pull/192) [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/insecure_android_apk.zip?branch=pull/192) ACKs for top commit: johnny9: ACK bitcoin-core/gui-qml@79af12b Tree-SHA512: d82bb4f20bfe65cfb45fb19b0cbbcd16f31500df0ca3a132c473245677a6b66264a21a756abbc89589cac610fd7e075813637ffa6a659b8729735d341d5805bd
tx-signer450
added a commit
to tx-signer450/gui-qml
that referenced
this pull request
Oct 20, 2025
… plus padding
7009c449395e64f66239b1ad5dbcd10adcce8a5d qml: constrain Options views to 450 pixels plus padding (Johnny Carlson)
Pull request description:
ACKs for top commit:
jarolrod:
ACK 7009c449395e64f66239b1ad5dbcd10adcce8a5d
Tree-SHA512: 15abd073cba1f1fdfed9c781d9cd346a38f38c7e5eb5d02b0fb818ae81156ade196abfb352a4a0caba4d98da98453d8ddef37c11052ffa06b93742c74275fa22
tx-signer450
added a commit
to tx-signer450/gui-qml
that referenced
this pull request
Oct 20, 2025
… pages 79af12b36418ae73f6bd594db04b0c01d8d3a869 qml: use the OnboardingInfo control for onboarding settings views (jarolrod) 9c330e7d928060b1ac163ca8cc77b6b67410445d qml: make continueButton text optional in the OnboardingInfo control (jarolrod) Pull request description: This PR reworks the `OnboardingInfo` control so that we can use it for *all* onboarding pages. The `OnboardingInfo` control doesn't work for the onboarding pages which represent the advanced settings views because the `OnboardingInfo` control always shows the continue button, which the advanced settings views do not use. We get around this here by making the buttonText value optional, making it so that the ContinueButton is not visible or enabled when the continueText value is not specified. Additionally, this now changes the way that we fix the issue shown in bitcoin-core/gui-qml#185. Instead of setting a maxwidth or 490 for the content, we give the `Setting` control an implicitWidth of 450. This is necessary in order to accommodate this change as we will no longer have an independent Header control which stretches out the width. ## Desktop ### master | a | b | c | d | | - | - | - | - | | <img width="752" alt="Screen Shot 2022-11-23 at 1 40 14 AM" src="https://user-images.githubusercontent.com/23396902/203560540-8766703f-f214-4d0c-bc07-27ae1fd244c8.png"> | <img width="752" alt="Screen Shot 2022-11-23 at 1 40 26 AM" src="https://user-images.githubusercontent.com/23396902/203560559-a58ff346-11be-4da4-8dbd-8f08adae7a7b.png"> | <img width="752" alt="Screen Shot 2022-11-23 at 1 40 40 AM" src="https://user-images.githubusercontent.com/23396902/203560582-582f404f-2c47-4609-9ac8-9b71c44567ef.png"> | <img width="752" alt="Screen Shot 2022-11-23 at 1 40 52 AM" src="https://user-images.githubusercontent.com/23396902/203560606-b04738c7-3e1a-4e77-a612-524bf85e58c1.png"> | ### pr | a | b | c | d | | - | - | - | - | | <img width="752" alt="Screen Shot 2022-11-23 at 2 56 48 AM" src="https://user-images.githubusercontent.com/23396902/203560246-fd2137f3-8172-4fdb-9df9-fc7278777303.png"> | <img width="752" alt="Screen Shot 2022-11-23 at 2 56 55 AM" src="https://user-images.githubusercontent.com/23396902/203560306-3c4b064a-0054-4e0f-bfab-bddba5496a27.png"> | <img width="752" alt="Screen Shot 2022-11-23 at 2 57 10 AM" src="https://user-images.githubusercontent.com/23396902/203560333-0c962a39-9a52-4388-acdd-95ee517401db.png"> | <img width="752" alt="Screen Shot 2022-11-23 at 2 57 21 AM" src="https://user-images.githubusercontent.com/23396902/203560402-f54cb352-89df-4f33-8bc4-46021efcc52c.png"> | [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/insecure_win_gui.zip?branch=pull/192) [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/insecure_mac_gui.zip?branch=pull/192) [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos_arm64/insecure_mac_arm64_gui.zip?branch=pull/192) [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/insecure_android_apk.zip?branch=pull/192) ACKs for top commit: johnny9: ACK bitcoin-core/gui-qml@79af12b Tree-SHA512: d82bb4f20bfe65cfb45fb19b0cbbcd16f31500df0ca3a132c473245677a6b66264a21a756abbc89589cac610fd7e075813637ffa6a659b8729735d341d5805bd
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.