Unity 8

Merge lp:~gerboland/unity8/unity8-with-WM-fixes into lp:unity8

  1. unity8-with-WM-fixes
  2. Merge into trunk
Proposed by Gerry Boland
Status: Merged
Approved by: Michał Sawicz
Approved revision: 374
Merged at revision: 386
Proposed branch: lp:~gerboland/unity8/unity8-with-WM-fixes
Merge into: lp:unity8
Diff against target: 22 lines (+4/-1)
1 file modified
Components/Stage.qml (+4/-1)
To merge this branch: bzr merge lp:~gerboland/unity8/unity8-with-WM-fixes
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michał Sawicz Approve
Review via email: mp+188946@code.launchpad.net

Commit message

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

Description of the change

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

To be tested in conjunction with https://code.launchpad.net/~gerboland/unity-mir/add-fail-and-resume-focus-support/+merge/188040

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:374
http://jenkins.qa.ubuntu.com/job/unity8-ci/1239/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4421
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2166
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2031
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/262
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1239
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1239/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1238
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/705
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/296
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/296/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2168
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2168/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1844
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1862

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1239/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Components/Stage.qml'
2--- Components/Stage.qml 2013-09-09 09:28:11 +0000
3+++ Components/Stage.qml 2013-10-02 22:05:33 +0000
4@@ -97,7 +97,9 @@
5 if (shouldUseScreenshots) {
6 stage.__focusApplicationUsingScreenshots(stage.focusedApplication);
7 } else {
8- stage.__focusActualApplication(stage.focusedApplicationWhenUsingScreenshots);
9+ if (stage.focusedApplicationWhenUsingScreenshots) {
10+ stage.__focusActualApplication(stage.focusedApplicationWhenUsingScreenshots);
11+ }
12 }
13 }
14
15@@ -244,6 +246,7 @@
16 */
17 delayedHideScreenshots.start();
18 } else {
19+ stage.focusedApplicationWhenUsingScreenshots = null;
20 stage.__hideScreenshots();
21 }
22 }

Subscribers

People subscribed via source and target branches