git.iko.soy/unity8
on xenial help sign in
consistent top margins (11gu) for desktop version
commite8703fd73c598c10e04fd16a7eb0309e80770acc authorLukáš Tinkl <lukas.tinkl@canonical.com> dateFri 18 Dec 2015, 13:53 (11 years ago) parentd2dcd5e
6 files changed+13−12
compare with xenial
unifiedsplit
qml/Wizard/Page.qml+2−1 qml/Wizard/Pages/10-welcome.qml+3−3 qml/Wizard/Pages/30-wifi.qml+2−2 qml/Wizard/Pages/40-location.qml+2−2 qml/Wizard/Pages/50-timezone.qml+2−2 qml/Wizard/Pages/70-passwd-type.qml+2−2
qml/Wizard/Page.qml+2−1
@@ -20,6 +20,7 @@ import Wizard 0.1
2020
2121Item {
2222 readonly property real maximumContentWidth: units.gu(50)
23+ readonly property bool desktopLook: width > maximumContentWidth
2324
2425 readonly property real buttonMargin: units.gu(3)
2526 readonly property real buttonWidth: (width - buttonMargin * 2) / 2 -
@@ -31,7 +32,7 @@ Item {
3132 readonly property real bottomMargin: units.gu(3)
3233 readonly property real leftMargin: Math.max(units.gu(3), (width - maximumContentWidth) / 3)
3334 readonly property real rightMargin: leftMargin
34− readonly property real customMargin: units.gu(4) // margin for the custom (w/o title image) pages
35+ readonly property real customMargin: desktopLook ? units.gu(11) : units.gu(4) // margin for the content
3536 readonly property real staticMargin: units.gu(3)
3637
3738 // colors
qml/Wizard/Pages/10-welcome.qml+3−3
@@ -95,9 +95,9 @@ LocalComponents.Page {
9595
9696 anchors {
9797 fill: content
98− leftMargin: parent.width > maximumContentWidth ? parent.leftMargin : 0
99− rightMargin: parent.width > maximumContentWidth ? parent.rightMargin : 0
100− topMargin: parent.width > maximumContentWidth ? parent.customMargin : 0
98+ leftMargin: desktopLook ? parent.leftMargin : 0
99+ rightMargin: desktopLook ? parent.rightMargin : 0
100+ topMargin: desktopLook ? parent.customMargin : 0
101101 }
102102
103103 model: plugin.languageNames
qml/Wizard/Pages/30-wifi.qml+2−2
@@ -153,8 +153,8 @@ LocalComponents.Page {
153153 anchors {
154154 fill: content
155155 topMargin: customMargin
156− leftMargin: parent.width > maximumContentWidth ? parent.leftMargin : 0
157− rightMargin: parent.width > maximumContentWidth ? parent.rightMargin : 0
156+ leftMargin: desktopLook ? parent.leftMargin : 0
157+ rightMargin: desktopLook ? parent.rightMargin : 0
158158 }
159159
160160 Label {
qml/Wizard/Pages/40-location.qml+2−2
@@ -54,8 +54,8 @@ LocalComponents.Page {
5454 id: column
5555 anchors.fill: content
5656 anchors.topMargin: customMargin
57− anchors.leftMargin: parent.width > maximumContentWidth ? parent.leftMargin : 0
58− anchors.rightMargin: parent.width > maximumContentWidth ? parent.rightMargin : 0
57+ anchors.leftMargin: desktopLook ? parent.leftMargin : 0
58+ anchors.rightMargin: desktopLook ? parent.rightMargin : 0
5959
6060 Item {
6161 id: hereCheckGroup
qml/Wizard/Pages/50-timezone.qml+2−2
@@ -121,8 +121,8 @@ LocalComponents.Page {
121121 anchors {
122122 fill: content
123123 topMargin: customMargin
124− leftMargin: parent.width > maximumContentWidth ? parent.leftMargin : 0
125− rightMargin: parent.width > maximumContentWidth ? parent.rightMargin : 0
124+ leftMargin: desktopLook ? parent.leftMargin : 0
125+ rightMargin: desktopLook ? parent.rightMargin : 0
126126 }
127127
128128 LocalComponents.WizardTextField {
qml/Wizard/Pages/70-passwd-type.qml+2−2
@@ -59,8 +59,8 @@ LocalComponents.Page {
5959 id: column
6060 anchors.fill: content
6161 anchors.topMargin: customMargin
62− anchors.leftMargin: parent.width > maximumContentWidth ? parent.leftMargin : 0
63− anchors.rightMargin: parent.width > maximumContentWidth ? parent.rightMargin : 0
62+ anchors.leftMargin: desktopLook ? parent.leftMargin : 0
63+ anchors.rightMargin: desktopLook ? parent.rightMargin : 0
6464
6565 ListView {
6666 id: selector