git.iko.soy/unity8
on xenial help sign in
account page tweaks
9d20333Lukáš Tinkl
qml/Wizard/Page.qml+1−1
compare with xenial
unifiedsplit
@@ -20,7 +20,7 @@ import Wizard 0.1
20
20
21Item {
21Item {
22 readonly property real maximumContentWidth: units.gu(50)
22 readonly property real maximumContentWidth: units.gu(50)
23− readonly property bool desktopLook: width > units.gu(60) && width > height
23+ readonly property bool desktopLook: width > units.gu(90) && width > height
24
24
25 readonly property real buttonMargin: units.gu(3)
25 readonly property real buttonMargin: units.gu(3)
26 readonly property real buttonWidth: (width - buttonMargin * 2) / 2 -
26 readonly property real buttonWidth: (width - buttonMargin * 2) / 2 -
qml/Wizard/Pages/50-timezone.qml+1−1
@@ -15,7 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18−import QtQuick.Layouts 1.2
18+import QtQuick.Layouts 1.1
19import QtGraphicalEffects 1.0
19import QtGraphicalEffects 1.0
20import Ubuntu.Components 1.3
20import Ubuntu.Components 1.3
21import Wizard 0.1
21import Wizard 0.1
qml/Wizard/Pages/60-account.qml+15
@@ -51,6 +51,11 @@ LocalComponents.Page {
51 anchors.rightMargin: parent.rightMargin
51 anchors.rightMargin: parent.rightMargin
52 anchors.topMargin: customMargin
52 anchors.topMargin: customMargin
53
53
54+ height: contentHeight - buttonBarHeight - Qt.inputMethod.keyboardRectangle.height - titleRectHeight
55+ contentHeight: childrenRect.height
56+
57+ Behavior on contentY { UbuntuNumberAnimation{} }
58+
54 // name
59 // name
55 Label {
60 Label {
56 id: nameLabel
61 id: nameLabel
@@ -70,6 +75,11 @@ LocalComponents.Page {
70 anchors.topMargin: units.gu(1)
75 anchors.topMargin: units.gu(1)
71 inputMethodHints: Qt.ImhNoPredictiveText
76 inputMethodHints: Qt.ImhNoPredictiveText
72 onAccepted: surnameInput.forceActiveFocus()
77 onAccepted: surnameInput.forceActiveFocus()
78+ onActiveFocusChanged: {
79+ if (activeFocus && Qt.inputMethod.visible) {
80+ column.contentY = nameLabel.y
81+ }
82+ }
73 }
83 }
74
84
75 // surname
85 // surname
@@ -93,6 +103,11 @@ LocalComponents.Page {
93 anchors.topMargin: units.gu(1)
103 anchors.topMargin: units.gu(1)
94 inputMethodHints: Qt.ImhNoPredictiveText
104 inputMethodHints: Qt.ImhNoPredictiveText
95 onAccepted: d.advance()
105 onAccepted: d.advance()
106+ onActiveFocusChanged: {
107+ if (activeFocus && Qt.inputMethod.visible) {
108+ column.contentY = surnameLabel.y
109+ }
110+ }
96 }
111 }
97 }
112 }
98
113