Unity 8

Merge lp:~mzanetti/unity8/spread-fixes-2 into lp:unity8

  1. spread-fixes-2
  2. Merge into trunk
Proposed by Michael Zanetti
Status: Merged
Approved by: Michał Sawicz
Approved revision: 2689
Merged at revision: 2688
Proposed branch: lp:~mzanetti/unity8/spread-fixes-2
Merge into: lp:unity8
Prerequisite: lp:~mzanetti/unity8/spread-fixes
Diff against target: 63 lines (+10/-8)
1 file modified
qml/Stage/Stage.qml (+10/-8)
To merge this branch: bzr merge lp:~mzanetti/unity8/spread-fixes-2
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Approve
Lukáš Tinkl (community) Approve
Review via email: mp+310281@code.launchpad.net

Commit message

More fixes to the unified stages code

Description of the change

 * Are there any related MPs required for this MP to build/function as expected? Please list.
see prereq
 * Did you perform an exploratory manual test run of your code change and any related functionality?
yip yip
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
nope
 * If you changed the UI, has there been a design review?
nope

To post a comment you must log in.
lp:~mzanetti/unity8/spread-fixes-2 updated
2689. By Michael Zanetti

fix typo

Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

Nice one, it fixes all 3 attached bug reports. Gonna wait for CI with top approval

review: Approve
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2688
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2477/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3266
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1869
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1869
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/1869
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3294
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3148
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3148/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3148
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3148/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3148
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3148/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3148
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3148/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3148
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3148/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3148
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3148/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3148
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3148/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3148
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3148/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3148
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3148/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2477/rebuild

review: Approve (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2689
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2478/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3267
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1870
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1870
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/1870
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3295
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3149
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3149/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3149
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3149/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3149
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3149/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3149
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3149/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3149
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3149/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3149
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3149/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3149
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3149/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3149
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3149/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3149
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3149/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2478/rebuild

review: Approve (continuous-integration)
lp:~mzanetti/unity8/spread-fixes-2 updated
2690. By Michael Zanetti

merge prereq

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Stage/Stage.qml'
2--- qml/Stage/Stage.qml 2016-11-09 14:53:43 +0000
3+++ qml/Stage/Stage.qml 2016-11-09 14:53:43 +0000
4@@ -235,6 +235,12 @@
5 readonly property bool sideStageEnabled: root.mode === "stagedWithSideStage" &&
6 (root.shellOrientation == Qt.LandscapeOrientation ||
7 root.shellOrientation == Qt.InvertedLandscapeOrientation)
8+ onSideStageEnabledChanged: {
9+ for (var i = 0; i < appRepeater.count; i++) {
10+ appRepeater.itemAt(i).refreshStage();
11+ }
12+ priv.updateMainAndSideStageIndexes();
13+ }
14
15 property var mainStageDelegate: null
16 property var sideStageDelegate: null
17@@ -255,7 +261,7 @@
18 priv.sideStageItemId = 0;
19 priv.sideStageAppId = "";
20 priv.mainStageDelegate = appRepeater.itemAt(0);
21- priv.mainStageAppId = topLevelSurfaceList.idAt(0);
22+ priv.mainStageItemId = topLevelSurfaceList.idAt(0);
23 priv.mainStageAppId = topLevelSurfaceList.applicationAt(0) ? topLevelSurfaceList.applicationAt(0).appId : ""
24 return;
25 }
26@@ -451,7 +457,7 @@
27 },
28 State {
29 name: "stagedWithSideStage"; when: root.mode === "stagedWithSideStage"
30- PropertyChanges { target: triGestureArea; enabled: true }
31+ PropertyChanges { target: triGestureArea; enabled: priv.sideStageEnabled }
32 PropertyChanges { target: sideStage; visible: true }
33 },
34 State {
35@@ -552,7 +558,7 @@
36 bottom: parent.bottom
37 }
38 width: appContainer.width - sideStage.width
39- enabled: sideStage.enabled
40+ enabled: priv.sideStageEnabled
41
42 onDropped: {
43 drop.source.appDelegate.saveStage(ApplicationInfoInterface.MainStage);
44@@ -596,7 +602,7 @@
45 }
46
47 onShownChanged: {
48- if (!shown && priv.mainStageDelegate) {
49+ if (!shown && priv.mainStageDelegate && !root.spreadShown) {
50 priv.mainStageDelegate.claimFocus();
51 }
52 }
53@@ -709,10 +715,6 @@
54 }
55 }
56 }
57- Connections {
58- target: priv
59- onSideStageEnabledChanged: refreshStage()
60- }
61
62 readonly property alias application: decoratedWindow.application
63 readonly property alias minimumWidth: decoratedWindow.minimumWidth

Subscribers

People subscribed via source and target branches