@@ -31,6 +31,7 @@ LocalComponents.Page {
3131 forwardButtonSourceComponent: forwardButton
3232
3333 property string selectedTimeZone: ""
34+ readonly property bool showingMap: desktopLook && width >= units.gu(110)
3435
3536 // for testing
3637 readonly property alias tdModule: timeDatePanel
@@ -161,9 +162,9 @@ LocalComponents.Page {
161162 left: content.left
162163 top: content.top
163164 bottom: content.bottom
164− right: !desktopLook ? content.right : undefined
165− leftMargin: desktopLook ? staticMargin : 0
166− rightMargin: desktopLook ? staticMargin : 0
165+ right: !showingMap ? content.right : undefined
166+ leftMargin: showingMap ? staticMargin : (desktopLook ? tzPage.leftMargin : 0)
167+ rightMargin: showingMap ? staticMargin : (desktopLook ? tzPage.rightMargin : 0)
167168 topMargin: customMargin
168169 }
169170
@@ -174,8 +175,8 @@ LocalComponents.Page {
174175 objectName: "tzFilter"
175176 anchors.left: parent.left
176177 anchors.right: parent.right
177− anchors.leftMargin: !desktopLook ? staticMargin : 0
178− anchors.rightMargin: !desktopLook ? staticMargin : 0
178+ anchors.leftMargin: !showingMap && !desktopLook ? staticMargin : undefined
179+ anchors.rightMargin: !showingMap && !desktopLook ? staticMargin : undefined
179180 placeholderText: i18n.tr("Enter your city")
180181 inputMethodHints: Qt.ImhNoPredictiveText
181182 onTextChanged: resetViews();
@@ -183,10 +184,11 @@ LocalComponents.Page {
183184
184185 ListView {
185186 Layout.fillHeight: true
186− Layout.fillWidth: true
187187 id: tzList
188188 objectName: "tzList"
189189 clip: true
190+ anchors.left: parent.left
191+ anchors.right: parent.right
190192 currentIndex: -1
191193 model: TimeZoneModel {
192194 id: timeZoneModel
@@ -207,7 +209,7 @@ LocalComponents.Page {
207209
208210 Item {
209211 id: mapContainer
210− visible: desktopLook && !contentAnimationRunning
212+ visible: showingMap && !contentAnimationRunning
211213 enabled: visible
212214
213215 anchors {