From 1b8d261e959988ccd8d06c23f01f7f8834931861 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 23 Mar 2021 12:57:38 +0100 Subject: [PATCH] Correct spacing in Welcome screen CURA-8094 Cura onboarding flow --- resources/qml/WelcomePages/WelcomeContent.qml | 50 +++++++++++++------ 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/resources/qml/WelcomePages/WelcomeContent.qml b/resources/qml/WelcomePages/WelcomeContent.qml index 6d429677a4..6e05cad010 100644 --- a/resources/qml/WelcomePages/WelcomeContent.qml +++ b/resources/qml/WelcomePages/WelcomeContent.qml @@ -29,26 +29,39 @@ Item scale: 0.666 } - Label + Column { - id: titleLabel anchors.horizontalCenter: parent.horizontalCenter - horizontalAlignment: Text.AlignHCenter - text: catalog.i18nc("@label", "Welcome to Ultimaker Cura") - color: UM.Theme.getColor("primary_button") - font: UM.Theme.getFont("huge_bold") - renderType: Text.NativeRendering + spacing: UM.Theme.getSize("thick_margin").height + + Label + { + id: titleLabel + anchors.horizontalCenter: parent.horizontalCenter + horizontalAlignment: Text.AlignHCenter + text: catalog.i18nc("@label", "Welcome to Ultimaker Cura") + color: UM.Theme.getColor("primary_button") + font: UM.Theme.getFont("huge_bold") + renderType: Text.NativeRendering + } + + Label + { + id: textLabel + anchors.horizontalCenter: parent.horizontalCenter + horizontalAlignment: Text.AlignHCenter + text: catalog.i18nc("@text", "Please follow these steps to set up Ultimaker Cura.\nThis will only take a few moments.") + font: UM.Theme.getFont("medium") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering + } } - Label + // Filler item + Item { - id: textLabel - anchors.horizontalCenter: parent.horizontalCenter - horizontalAlignment: Text.AlignHCenter - text: catalog.i18nc("@text", "Please follow these steps to set up Ultimaker Cura.\nThis will only take a few moments.") - font: UM.Theme.getFont("medium") - color: UM.Theme.getColor("text") - renderType: Text.NativeRendering + height: UM.Theme.getSize("thick_margin").height + width: parent.width } Cura.PrimaryButton @@ -58,5 +71,12 @@ Item text: catalog.i18nc("@button", "Get started") onClicked: base.showNextPage() } + + // Filler item + Item + { + height: UM.Theme.getSize("thick_margin").height + width: parent.width + } } }