git.iko.soy/unity8
on xenial help sign in
account page tweaks
commit9d20333e97c7e7f819274625493b6e1847f71f3a authorLukáš Tinkl <lukas.tinkl@canonical.com> dateThu 18 Feb 2016, 14:47 (11 years ago) parent0a23eb2
3 files changed+17−2
compare with xenial
unifiedsplit
qml/Wizard/Page.qml+1−1 qml/Wizard/Pages/50-timezone.qml+1−1 qml/Wizard/Pages/60-account.qml+15
qml/Wizard/Page.qml+1−1
@@ -20,7 +20,7 @@ import Wizard 0.1
2020
2121Item {
2222 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
2424
2525 readonly property real buttonMargin: units.gu(3)
2626 readonly property real buttonWidth: (width - buttonMargin * 2) / 2 -
qml/Wizard/Pages/50-timezone.qml+1−1
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.4
18−import QtQuick.Layouts 1.2
18+import QtQuick.Layouts 1.1
1919import QtGraphicalEffects 1.0
2020import Ubuntu.Components 1.3
2121import Wizard 0.1
qml/Wizard/Pages/60-account.qml+15
@@ -51,6 +51,11 @@ LocalComponents.Page {
5151 anchors.rightMargin: parent.rightMargin
5252 anchors.topMargin: customMargin
5353
54+ height: contentHeight - buttonBarHeight - Qt.inputMethod.keyboardRectangle.height - titleRectHeight
55+ contentHeight: childrenRect.height
56+
57+ Behavior on contentY { UbuntuNumberAnimation{} }
58+
5459 // name
5560 Label {
5661 id: nameLabel
@@ -70,6 +75,11 @@ LocalComponents.Page {
7075 anchors.topMargin: units.gu(1)
7176 inputMethodHints: Qt.ImhNoPredictiveText
7277 onAccepted: surnameInput.forceActiveFocus()
78+ onActiveFocusChanged: {
79+ if (activeFocus && Qt.inputMethod.visible) {
80+ column.contentY = nameLabel.y
81+ }
82+ }
7383 }
7484
7585 // surname
@@ -93,6 +103,11 @@ LocalComponents.Page {
93103 anchors.topMargin: units.gu(1)
94104 inputMethodHints: Qt.ImhNoPredictiveText
95105 onAccepted: d.advance()
106+ onActiveFocusChanged: {
107+ if (activeFocus && Qt.inputMethod.visible) {
108+ column.contentY = surnameLabel.y
109+ }
110+ }
96111 }
97112 }
98113