git.iko.soy/unity8
on xenial help sign in
consistent top margins (11gu) for desktop version
e8703fdLukáš Tinkl
qml/Wizard/Page.qml+2−1
compare with xenial
unifiedsplit
@@ -20,6 +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 > maximumContentWidth
23
24
24 readonly property real buttonMargin: units.gu(3)
25 readonly property real buttonMargin: units.gu(3)
25 readonly property real buttonWidth: (width - buttonMargin * 2) / 2 -
26 readonly property real buttonWidth: (width - buttonMargin * 2) / 2 -
@@ -31,7 +32,7 @@ Item {
31 readonly property real bottomMargin: units.gu(3)
32 readonly property real bottomMargin: units.gu(3)
32 readonly property real leftMargin: Math.max(units.gu(3), (width - maximumContentWidth) / 3)
33 readonly property real leftMargin: Math.max(units.gu(3), (width - maximumContentWidth) / 3)
33 readonly property real rightMargin: leftMargin
34 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
35 readonly property real staticMargin: units.gu(3)
36 readonly property real staticMargin: units.gu(3)
36
37
37 // colors
38 // colors
qml/Wizard/Pages/10-welcome.qml+3−3
@@ -95,9 +95,9 @@ LocalComponents.Page {
95
95
96 anchors {
96 anchors {
97 fill: content
97 fill: content
98− leftMargin: parent.width > maximumContentWidth ? parent.leftMargin : 0
98+ leftMargin: desktopLook ? parent.leftMargin : 0
99− rightMargin: parent.width > maximumContentWidth ? parent.rightMargin : 0
99+ rightMargin: desktopLook ? parent.rightMargin : 0
100− topMargin: parent.width > maximumContentWidth ? parent.customMargin : 0
100+ topMargin: desktopLook ? parent.customMargin : 0
101 }
101 }
102
102
103 model: plugin.languageNames
103 model: plugin.languageNames
qml/Wizard/Pages/30-wifi.qml+2−2
@@ -153,8 +153,8 @@ LocalComponents.Page {
153 anchors {
153 anchors {
154 fill: content
154 fill: content
155 topMargin: customMargin
155 topMargin: customMargin
156− leftMargin: parent.width > maximumContentWidth ? parent.leftMargin : 0
156+ leftMargin: desktopLook ? parent.leftMargin : 0
157− rightMargin: parent.width > maximumContentWidth ? parent.rightMargin : 0
157+ rightMargin: desktopLook ? parent.rightMargin : 0
158 }
158 }
159
159
160 Label {
160 Label {
qml/Wizard/Pages/40-location.qml+2−2
@@ -54,8 +54,8 @@ LocalComponents.Page {
54 id: column
54 id: column
55 anchors.fill: content
55 anchors.fill: content
56 anchors.topMargin: customMargin
56 anchors.topMargin: customMargin
57− anchors.leftMargin: parent.width > maximumContentWidth ? parent.leftMargin : 0
57+ anchors.leftMargin: desktopLook ? parent.leftMargin : 0
58− anchors.rightMargin: parent.width > maximumContentWidth ? parent.rightMargin : 0
58+ anchors.rightMargin: desktopLook ? parent.rightMargin : 0
59
59
60 Item {
60 Item {
61 id: hereCheckGroup
61 id: hereCheckGroup
qml/Wizard/Pages/50-timezone.qml+2−2
@@ -121,8 +121,8 @@ LocalComponents.Page {
121 anchors {
121 anchors {
122 fill: content
122 fill: content
123 topMargin: customMargin
123 topMargin: customMargin
124− leftMargin: parent.width > maximumContentWidth ? parent.leftMargin : 0
124+ leftMargin: desktopLook ? parent.leftMargin : 0
125− rightMargin: parent.width > maximumContentWidth ? parent.rightMargin : 0
125+ rightMargin: desktopLook ? parent.rightMargin : 0
126 }
126 }
127
127
128 LocalComponents.WizardTextField {
128 LocalComponents.WizardTextField {
qml/Wizard/Pages/70-passwd-type.qml+2−2
@@ -59,8 +59,8 @@ LocalComponents.Page {
59 id: column
59 id: column
60 anchors.fill: content
60 anchors.fill: content
61 anchors.topMargin: customMargin
61 anchors.topMargin: customMargin
62− anchors.leftMargin: parent.width > maximumContentWidth ? parent.leftMargin : 0
62+ anchors.leftMargin: desktopLook ? parent.leftMargin : 0
63− anchors.rightMargin: parent.width > maximumContentWidth ? parent.rightMargin : 0
63+ anchors.rightMargin: desktopLook ? parent.rightMargin : 0
64
64
65 ListView {
65 ListView {
66 id: selector
66 id: selector