on xenial help sign in
fix inner delegate margins and map-over-OSK
2eaf5b4Lukáš Tinkl
qml/Wizard/Pages/50-timezone.qml+3−3
@@ -107,7 +107,7 @@ LocalComponents.Page {
107 Column {
107 Column {
108 anchors.verticalCenter: parent.verticalCenter
108 anchors.verticalCenter: parent.verticalCenter
109 anchors.left: parent.left
109 anchors.left: parent.left
110− anchors.leftMargin: staticMargin
110+ anchors.leftMargin: !desktopLook ? staticMargin : 0
111 anchors.right: image.left
111 anchors.right: image.left
112 anchors.rightMargin: units.gu(2)
112 anchors.rightMargin: units.gu(2)
113
113
@@ -134,7 +134,7 @@ LocalComponents.Page {
134 anchors {
134 anchors {
135 right: parent.right
135 right: parent.right
136 verticalCenter: parent.verticalCenter
136 verticalCenter: parent.verticalCenter
137− rightMargin: staticMargin
137+ rightMargin: !desktopLook ? staticMargin : 0
138 }
138 }
139 fillMode: Image.PreserveAspectFit
139 fillMode: Image.PreserveAspectFit
140 height: units.gu(1.5)
140 height: units.gu(1.5)
@@ -214,7 +214,7 @@ LocalComponents.Page {
214 Layout.fillWidth: desktopLook
214 Layout.fillWidth: desktopLook
215 Layout.fillHeight: true
215 Layout.fillHeight: true
216 id: mapContainer
216 id: mapContainer
217− visible: desktopLook && !contentAnimationRunning
217+ visible: desktopLook && !contentAnimationRunning && !Qt.inputMethod.visible
218 enabled: visible
218 enabled: visible
219
219
220 Item {
220 Item {