Skip to content

Commit 98038bb

Browse files
committed
Merge #190: Constrain ContinueButton width to 300 pixels
2b4f905 qml: constrain ContinueButton width to 300 pixels (Johnny Carlson) Pull request description: Addresses the issue with the button stretching too far on a wide mobile/tablet. [![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/190) [![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/190) [![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/190) [![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/190) ACKs for top commit: jarolrod: ACK 2b4f905 Tree-SHA512: b65c0368511e7fda7c2aa134513b16cf7e0e9e72440746fb46d53273cf14c849d410ccb20bfef2451b88247add7980f214ba19373c645005c830b20911134a80
2 parents 294869b + 2b4f905 commit 98038bb

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

src/qml/controls/InformationPage.qml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,12 @@ Page {
8282
id: continueButton
8383
visible: root.buttonText.length > 0
8484
enabled: visible
85+
width: Math.min(300, parent.width - 2 * anchors.leftMargin)
8586
anchors.topMargin: 40
8687
anchors.bottomMargin: 60
8788
anchors.leftMargin: 20
8889
anchors.rightMargin: 20
90+
anchors.horizontalCenter: parent.horizontalCenter
8991
text: root.buttonText
9092
onClicked: root.lastPage ? swipeView.finished = true : swipeView.incrementCurrentIndex()
9193
}
@@ -99,9 +101,6 @@ Page {
99101
target: continueButton
100102
anchors.top: undefined
101103
anchors.bottom: continueButton.parent.bottom
102-
anchors.right: continueButton.parent.right
103-
anchors.left: continueButton.parent.left
104-
anchors.horizontalCenter: undefined
105104
}
106105
},
107106
State {
@@ -110,9 +109,6 @@ Page {
110109
target: continueButton
111110
anchors.top: information.bottom
112111
anchors.bottom: undefined
113-
anchors.left: undefined
114-
anchors.right: undefined
115-
anchors.horizontalCenter: parent.horizontalCenter
116112
}
117113
}
118114
]

0 commit comments

Comments
 (0)