Unity 8

Merge lp:~dandrader/unity8/sideStage_lp1281088_take2 into lp:unity8

  1. sideStage_lp1281088_take2
  2. Merge into trunk
Proposed by Daniel d'Andrada
Status: Merged
Merged at revision: 782
Proposed branch: lp:~dandrader/unity8/sideStage_lp1281088_take2
Merge into: lp:unity8
Diff against target: 31 lines (+5/-5)
2 files modified
qml/Components/Stage.qml (+0/-5)
qml/Shell.qml (+5/-0)
To merge this branch: bzr merge lp:~dandrader/unity8/sideStage_lp1281088_take2
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Unity Team Pending
Review via email: mp+207430@code.launchpad.net

Commit message

When focus is requested by the app manager, only call the correct stage.

Instead of activating both stages and letting the correct one work it out.

Description of the change

Fixes bug 1281088.

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

FAILED: Continuous integration, rev:728
http://jenkins.qa.ubuntu.com/job/unity8-ci/2359/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3350/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3009
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1229
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/880/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/884
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/884/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/880
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2953/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3352
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3352/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3011
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3011/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5410
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4130

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

Wonder if we could test this... I know it's being replaced soon by completely new sidestage/rightedge implementation, but maybe that's all the more reason to have a test?

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:728
http://jenkins.qa.ubuntu.com/job/unity8-ci/2579/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4113
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3697/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1449/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1104
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1104/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3588
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4174
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4174/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3699
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3699/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6015/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5041

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Components/Stage.qml'
2--- qml/Components/Stage.qml 2013-10-22 15:56:37 +0000
3+++ qml/Components/Stage.qml 2014-02-20 12:59:38 +0000
4@@ -84,11 +84,6 @@
5 }
6 }
7
8- Connections {
9- target: applicationManager
10- onFocusRequested: activateApplication(appId)
11- }
12-
13 /* Keep a reference to the focused application so that we can safely
14 unfocus it when the stage is not fully shown and refocus it when the stage
15 is fully shown again.
16
17=== modified file 'qml/Shell.qml'
18--- qml/Shell.qml 2014-01-02 08:21:56 +0000
19+++ qml/Shell.qml 2014-02-20 12:59:38 +0000
20@@ -116,6 +116,11 @@
21 }
22 }
23
24+ Connections {
25+ target: applicationManager
26+ onFocusRequested: activateApplication(appId)
27+ }
28+
29 GSettings {
30 id: backgroundSettings
31 schema.id: "org.gnome.desktop.background"

Subscribers

People subscribed via source and target branches