git.iko.soy/unity8
on xenial help sign in
get rid of src -> source mapping for mainScreenshotImage and with that the fixme for the PropertyAction not working
02fa0f3Michael Zanetti
qml/Stages/PhoneStage.qml+8−13
compare with xenial
unifiedsplit
@@ -44,7 +44,7 @@ Item {
44 priv.requestNewScreenshot();
44 priv.requestNewScreenshot();
45 } else {
45 } else {
46 mainScreenshotImage.anchors.leftMargin = 0;
46 mainScreenshotImage.anchors.leftMargin = 0;
47− mainScreenshotImage.src = ApplicationManager.get(0).screenshot;
47+ mainScreenshotImage.source = ApplicationManager.get(0).screenshot;
48 mainScreenshotImage.visible = true;
48 mainScreenshotImage.visible = true;
49 }
49 }
50 } else {
50 } else {
@@ -70,7 +70,7 @@ Item {
70 } else {
70 } else {
71 var application = priv.focusedApplication;
71 var application = priv.focusedApplication;
72 root.fullscreen = application.fullscreen;
72 root.fullscreen = application.fullscreen;
73− mainScreenshotImage.src = application.screenshot;
73+ mainScreenshotImage.source = application.screenshot;
74 }
74 }
75 } else {
75 } else {
76 spreadView.selectedIndex = -1;
76 spreadView.selectedIndex = -1;
@@ -81,11 +81,11 @@ Item {
81
81
82 onApplicationAdded: {
82 onApplicationAdded: {
83 if (!priv.focusedApplication) {
83 if (!priv.focusedApplication) {
84− mainScreenshotImage.src = "";
84+ mainScreenshotImage.source = "";
85 mainScreenshotImage.visible = false;
85 mainScreenshotImage.visible = false;
86 priv.applicationStarting = true;
86 priv.applicationStarting = true;
87 } else {
87 } else {
88− mainScreenshotImage.src = "";
88+ mainScreenshotImage.source = "";
89 priv.newFocusedAppId = appId;
89 priv.newFocusedAppId = appId;
90 priv.secondApplicationStarting = true;
90 priv.secondApplicationStarting = true;
91 priv.requestNewScreenshot();
91 priv.requestNewScreenshot();
@@ -98,10 +98,10 @@ Item {
98
98
99 onApplicationRemoved: {
99 onApplicationRemoved: {
100 if (ApplicationManager.count == 0) {
100 if (ApplicationManager.count == 0) {
101− mainScreenshotImage.src = ""
101+ mainScreenshotImage.source = ""
102 mainScreenshotImage.visible = false;
102 mainScreenshotImage.visible = false;
103 } else {
103 } else {
104− mainScreenshotImage.src = ApplicationManager.get(0).screenshot;
104+ mainScreenshotImage.source = ApplicationManager.get(0).screenshot;
105 }
105 }
106 }
106 }
107 }
107 }
@@ -123,7 +123,7 @@ Item {
123 onFocusedScreenshotChanged: {
123 onFocusedScreenshotChanged: {
124 if (root.moving && priv.waitingForScreenshot) {
124 if (root.moving && priv.waitingForScreenshot) {
125 mainScreenshotImage.anchors.leftMargin = 0;
125 mainScreenshotImage.anchors.leftMargin = 0;
126− mainScreenshotImage.src = priv.focusedScreenshot
126+ mainScreenshotImage.source = priv.focusedScreenshot
127 mainScreenshotImage.visible = true;
127 mainScreenshotImage.visible = true;
128 } else if (priv.secondApplicationStarting && priv.waitingForScreenshot) {
128 } else if (priv.secondApplicationStarting && priv.waitingForScreenshot) {
129 applicationSwitchingAnimation.start();
129 applicationSwitchingAnimation.start();
@@ -186,8 +186,7 @@ Item {
186 id: applicationSwitchingAnimation
186 id: applicationSwitchingAnimation
187 // setup
187 // setup
188 PropertyAction { target: mainScreenshotImage; property: "anchors.leftMargin"; value: 0 }
188 PropertyAction { target: mainScreenshotImage; property: "anchors.leftMargin"; value: 0 }
189− // FIXME: PropertyAction seems to fail when secondApplicationStarting and we didn't have another screenshot before
190− ScriptAction { script: mainScreenshotImage.src = priv.focusedScreenshot }
189+ PropertyAction { target: mainScreenshotImage; property: "source"; value: priv.focusedScreenshot }
191 PropertyAction { targets: [mainScreenshotImage, fadeInScreenshotImage]; property: "visible"; value: true }
190 PropertyAction { targets: [mainScreenshotImage, fadeInScreenshotImage]; property: "visible"; value: true }
192 PropertyAction { target: fadeInScreenshotImage; property: "source"; value: {
191 PropertyAction { target: fadeInScreenshotImage; property: "source"; value: {
193 var newFocusedApp = ApplicationManager.findApplication(priv.newFocusedAppId);
192 var newFocusedApp = ApplicationManager.findApplication(priv.newFocusedAppId);
@@ -234,10 +233,6 @@ Item {
234 id: mainScreenshotImage
233 id: mainScreenshotImage
235 anchors { left: parent.left; bottom: parent.bottom }
234 anchors { left: parent.left; bottom: parent.bottom }
236 width: parent.width
235 width: parent.width
237−
238− // FIXME: Workaround for bug: https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1194778
239− property string src
240− source: src
241 visible: false
236 visible: false
242 }
237 }
243
238