git.iko.soy/unity8
on xenial help sign in
WM: ensure focusedApplicationWhenUsingScreenshots reset when unused, and only used when set. Fixes window focus conflict between shell and ApplicationManager.

Approved by PS Jenkins bot, Michał Sawicz.

commita1c9f9a3109bc24aedda4efb2084520826b8eab9 authorGerry Boland <gerry.boland@canonical.com> dateFri 4 Oct 2013, 00:26 (13 years ago) parentbf4d5ed8b1ac82
1 file changed+4−1
compare with xenial
unifiedsplit
Components/Stage.qml+4−1
Components/Stage.qml+4−1
@@ -97,7 +97,9 @@ Showable {
9797 if (shouldUseScreenshots) {
9898 stage.__focusApplicationUsingScreenshots(stage.focusedApplication);
9999 } else {
100− stage.__focusActualApplication(stage.focusedApplicationWhenUsingScreenshots);
100+ if (stage.focusedApplicationWhenUsingScreenshots) {
101+ stage.__focusActualApplication(stage.focusedApplicationWhenUsingScreenshots);
102+ }
101103 }
102104 }
103105
@@ -244,6 +246,7 @@ Showable {
244246 */
245247 delayedHideScreenshots.start();
246248 } else {
249+ stage.focusedApplicationWhenUsingScreenshots = null;
247250 stage.__hideScreenshots();
248251 }
249252 }