git.iko.soy/unity8
on xenial help sign in
merge in lp:~gerboland/unity8/sidestage-unlock-sidestage-appears
55786eaKevin Gunn
qml/Components/Stage.qml+10−2
compare with xenial
unifiedsplit
@@ -142,6 +142,14 @@ Showable {
142 }
142 }
143 }
143 }
144
144
145+ Timer {
146+ id: hideScreenshotsAfterBriefDelay
147+ // Since Mir & Qt have independent event loops, Mir often applies a focus request a frame later than when Qt
148+ // asks for it. To work around, delay removing the screenshots a touch so Mir has definitely shown the app.
149+ interval: 10
150+ onTriggered: stage.__hideScreenshots();
151+ }
152+
145 function __hideScreenshots() {
153 function __hideScreenshots() {
146 newApplicationScreenshot.clearApplication();
154 newApplicationScreenshot.clearApplication();
147 oldApplicationScreenshot.clearApplication();
155 oldApplicationScreenshot.clearApplication();
@@ -177,7 +185,7 @@ Showable {
177 applicationManager.focusApplication(application);
185 applicationManager.focusApplication(application);
178 }
186 }
179 if (!delayedHideScreenshots.running) {
187 if (!delayedHideScreenshots.running) {
180− stage.__hideScreenshots();
188+ hideScreenshotsAfterBriefDelay.start();
181 }
189 }
182 } else {
190 } else {
183 /* FIXME: calling ApplicationManager::focusApplication does not focus
191 /* FIXME: calling ApplicationManager::focusApplication does not focus
@@ -252,7 +260,7 @@ Showable {
252 delayedHideScreenshots.start();
260 delayedHideScreenshots.start();
253 } else {
261 } else {
254 stage.focusedApplicationWhenUsingScreenshots = null;
262 stage.focusedApplicationWhenUsingScreenshots = null;
255− stage.__hideScreenshots();
263+ hideScreenshotsAfterBriefDelay.start();
256 }
264 }
257 }
265 }
258 }
266 }