git.iko.soy/unity8
on xenial help sign in
remove Blend
c88e79fLukáš Tinkl
qml/Wizard/Pages/50-timezone.qml+4−9
compare with xenial
unifiedsplit
@@ -16,7 +16,6 @@
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18import QtQuick.Layouts 1.1
18import QtQuick.Layouts 1.1
19−import QtGraphicalEffects 1.0
20import Ubuntu.Components 1.3
19import Ubuntu.Components 1.3
21import Wizard 0.1
20import Wizard 0.1
22import Ubuntu.SystemSettings.TimeDate 1.0
21import Ubuntu.SystemSettings.TimeDate 1.0
@@ -237,8 +236,9 @@ LocalComponents.Page {
237 sourceSize: Qt.size(map.width, map.height)
236 sourceSize: Qt.size(map.width, map.height)
238 fillMode: Image.PreserveAspectFit
237 fillMode: Image.PreserveAspectFit
239 smooth: false
238 smooth: false
240− visible: false
239+ visible: mapContainer.visible
241 asynchronous: true
240 asynchronous: true
241+ anchors.fill: parent
242 }
242 }
243
243
244 Image {
244 Image {
@@ -246,14 +246,9 @@ LocalComponents.Page {
246 sourceSize: Qt.size(map.width, map.height)
246 sourceSize: Qt.size(map.width, map.height)
247 fillMode: Image.PreserveAspectFit
247 fillMode: Image.PreserveAspectFit
248 smooth: false
248 smooth: false
249− visible: false
249+ visible: selectedTimeZone != ""
250 asynchronous: true
250 asynchronous: true
251− }
252−
253− Blend {
254− anchors.fill: map
255− source: backgroundImage
251+ anchors.fill: backgroundImage
256− foregroundSource: highlightImage
257 }
252 }
258
253
259 Image {
254 Image {