@@ -34,14 +34,18 @@ LocalComponents.Page {
3434 readonly property alias password2: password2Field.text
3535 readonly property bool passwordsMatching: password == password2 && password.trim().length > 7
3636
37− ColumnLayout {
37+ Flickable {
3838 id: column
39+ clip: true
40+ flickableDirection: Flickable.VerticalFlick
3941 anchors.fill: content
40− anchors.leftMargin: leftMargin
41− anchors.rightMargin: rightMargin
42+ anchors.leftMargin: parent.leftMargin
43+ anchors.rightMargin: parent.rightMargin
4244 anchors.topMargin: customMargin
43− spacing: units.gu(3)
4445
46+ bottomMargin: Qt.inputMethod.keyboardRectangle.height
47+
48+ // info label
4549 Label {
4650 id: infoLabel
4751 objectName: "infoLabel"
@@ -55,31 +59,53 @@ LocalComponents.Page {
5559 text: i18n.tr("Enter at least 8 characters")
5660 }
5761
58− ColumnLayout {
59− id: innerLayout
60− Label {
61− text: i18n.tr("Choose password")
62− color: textColor
62+ // password
63+ Label {
64+ id: pass1Label
65+ anchors {
66+ left: parent.left
67+ right: parent.right
68+ top: infoLabel.bottom
69+ topMargin: units.gu(3)
6370 }
64− LocalComponents.WizardTextField {
65− Layout.fillWidth: true
66− id: passwordField
67− objectName: "passwordField"
68− echoMode: TextInput.Password
69− onAccepted: password2Field.forceActiveFocus()
71+ text: i18n.tr("Choose password")
72+ color: textColor
73+ }
74+ LocalComponents.WizardTextField {
75+ id: passwordField
76+ anchors {
77+ left: parent.left
78+ right: parent.right
79+ top: pass1Label.bottom
80+ topMargin: units.gu(1)
7081 }
82+ objectName: "passwordField"
83+ echoMode: TextInput.Password
84+ onAccepted: password2Field.forceActiveFocus()
85+ }
7186
72− Label {
73− text: i18n.tr("Confirm password")
74− color: textColor
75− anchors.topMargin: units.gu(1)
87+ // password 2
88+ Label {
89+ id: pass2Label
90+ anchors {
91+ left: parent.left
92+ right: parent.right
93+ top: passwordField.bottom
94+ topMargin: units.gu(3)
7695 }
77− LocalComponents.WizardTextField {
78− Layout.fillWidth: true
79− id: password2Field
80− objectName: "password2Field"
81− echoMode: TextInput.Password
96+ text: i18n.tr("Confirm password")
97+ color: textColor
98+ }
99+ LocalComponents.WizardTextField {
100+ anchors {
101+ left: parent.left
102+ right: parent.right
103+ top: pass2Label.bottom
104+ topMargin: units.gu(1)
82105 }
106+ id: password2Field
107+ objectName: "password2Field"
108+ echoMode: TextInput.Password
83109 }
84110
85111 // password meter
@@ -88,17 +114,13 @@ LocalComponents.Page {
88114 anchors {
89115 left: parent.left
90116 right: parent.right
91− top: innerLayout.bottom
117+ top: password2Field.bottom
92118 topMargin: units.gu(1)
93119 }
94120
95121 password: passwordField.text
96122 matching: passwordsMatching
97123 }
98−
99− Item { // spacer
100− Layout.fillHeight: true
101− }
102124 }
103125
104126 Component {