git.iko.soy/unity8
on xenial help sign in
move away the OSK
0e5985eLukáš Tinkl
qml/Wizard/Pages/password-set.qml+13−1
compare with xenial
unifiedsplit
@@ -43,7 +43,9 @@ LocalComponents.Page {
43 anchors.rightMargin: parent.rightMargin
43 anchors.rightMargin: parent.rightMargin
44 anchors.topMargin: customMargin
44 anchors.topMargin: customMargin
45
45
46− bottomMargin: Qt.inputMethod.keyboardRectangle.height
46+ bottomMargin: Qt.inputMethod.keyboardRectangle.height - height
47+
48+ Behavior on contentY { UbuntuNumberAnimation {} }
47
49
48 // info label
50 // info label
49 Label {
51 Label {
@@ -82,6 +84,11 @@ LocalComponents.Page {
82 objectName: "passwordField"
84 objectName: "passwordField"
83 echoMode: TextInput.Password
85 echoMode: TextInput.Password
84 onAccepted: password2Field.forceActiveFocus()
86 onAccepted: password2Field.forceActiveFocus()
87+ onActiveFocusChanged: {
88+ if (activeFocus) {
89+ column.contentY = pass1Label.y
90+ }
91+ }
85 }
92 }
86
93
87 // password 2
94 // password 2
@@ -106,6 +113,11 @@ LocalComponents.Page {
106 id: password2Field
113 id: password2Field
107 objectName: "password2Field"
114 objectName: "password2Field"
108 echoMode: TextInput.Password
115 echoMode: TextInput.Password
116+ onActiveFocusChanged: {
117+ if (activeFocus) {
118+ column.contentY = pass2Label.y
119+ }
120+ }
109 }
121 }
110
122
111 // password meter
123 // password meter