8b1ac82 · unity8 · git.iko.soy

git.iko.soy/unity8

WM: ensure focusedApplicationWhenUsingScreenshots reset when unused, and only used when set. Fixes window focus conflict between shell and ApplicationManager

8b1ac82Gerry Boland13 years ago

Components/Stage.qml+4−1

compare with xenial

unifiedsplit

@@ -97,7 +97,9 @@ Showable {

97 if (shouldUseScreenshots) {

98 stage.__focusApplicationUsingScreenshots(stage.focusedApplication);

99 } else {

100+ if (stage.focusedApplicationWhenUsingScreenshots) {

100− stage.__focusActualApplication(stage.focusedApplicationWhenUsingScreenshots);

101+ stage.__focusActualApplication(stage.focusedApplicationWhenUsingScreenshots);

102+ }

101 }

103 }

102 }

104 }

103

105

@@ -244,6 +246,7 @@ Showable {

244 */

246 */

245 delayedHideScreenshots.start();

247 delayedHideScreenshots.start();

246 } else {

248 } else {

249+ stage.focusedApplicationWhenUsingScreenshots = null;

247 stage.__hideScreenshots();

250 stage.__hideScreenshots();

248 }

251 }

249 }

252 }