on xenial help sign in
fix inner delegate margins and map-over-OSK
commit2eaf5b4465c29b619d55102be6688f2fd70556d9 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateTue 1 Mar 2016, 19:46 (11 years ago) parent55ecae8
1 file changed+3−3
qml/Wizard/Pages/50-timezone.qml+3−3
qml/Wizard/Pages/50-timezone.qml+3−3
@@ -107,7 +107,7 @@ LocalComponents.Page {
107107 Column {
108108 anchors.verticalCenter: parent.verticalCenter
109109 anchors.left: parent.left
110− anchors.leftMargin: staticMargin
110+ anchors.leftMargin: !desktopLook ? staticMargin : 0
111111 anchors.right: image.left
112112 anchors.rightMargin: units.gu(2)
113113
@@ -134,7 +134,7 @@ LocalComponents.Page {
134134 anchors {
135135 right: parent.right
136136 verticalCenter: parent.verticalCenter
137− rightMargin: staticMargin
137+ rightMargin: !desktopLook ? staticMargin : 0
138138 }
139139 fillMode: Image.PreserveAspectFit
140140 height: units.gu(1.5)
@@ -214,7 +214,7 @@ LocalComponents.Page {
214214 Layout.fillWidth: desktopLook
215215 Layout.fillHeight: true
216216 id: mapContainer
217− visible: desktopLook && !contentAnimationRunning
217+ visible: desktopLook && !contentAnimationRunning && !Qt.inputMethod.visible
218218 enabled: visible
219219
220220 Item {