Merge lp:~aacid/unity8/do_not_animate_panel_color_startup into lp:unity8

Proposed by Albert Astals Cid
Status: Merged
Approved by: Michael Terry
Approved revision: 2342
Merged at revision: 2428
Proposed branch: lp:~aacid/unity8/do_not_animate_panel_color_startup
Merge into: lp:unity8
Diff against target: 23 lines (+3/-2)
1 file modified
qml/Shell.qml (+3/-2)
To merge this branch: bzr merge lp:~aacid/unity8/do_not_animate_panel_color_startup
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Needs Fixing
Michael Terry Approve
Review via email: mp+293226@code.launchpad.net

Commit message

Set the theme earlier

This way we avoid some flashing/animating of colors because of the theme change

Description of the change

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

Could you avoid relying on "startingUp" from the shell by just avoiding animating color until the Panel object is Component.onCompleted?

Revision history for this message
Michael Terry (mterry) wrote :

Oh, I see we set the theme on Shell.onCompleted. But why do we do that? Can't we just set theme as a binding from the get go? Maybe that avoids this bug altogether then.

2342. By Albert Astals Cid

Set the theme earlier

This way we avoid some flashing/animating of colors because of the theme change

Revision history for this message
Albert Astals Cid (aacid) wrote :

> Oh, I see we set the theme on Shell.onCompleted. But why do we do that?
> Can't we just set theme as a binding from the get go? Maybe that avoids this
> bug altogether then.

Done.

Revision history for this message
Michael Terry (mterry) wrote :

LGTM.

Also tested with wizard (since it uses a different theme and now we'd be setting the theme before it's created) and it worked.

 * Did you perform an exploratory manual test run of the code change and any related functionality?
 Yes

 * Did CI run pass? If not, please explain why.
 TBD, but I don't envision a problem

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

FAILED: Continuous integration, rev:2342
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1081/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/630
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/630
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/630/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1452
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1418
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1418
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1418
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1418/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1418
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1418/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1418
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1418/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1418
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1418/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1418
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1418/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1418
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1418/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1081/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/Shell.qml'
2--- qml/Shell.qml 2016-04-21 13:47:29 +0000
3+++ qml/Shell.qml 2016-04-28 10:09:05 +0000
4@@ -45,9 +45,11 @@
5 import WindowManager 0.1
6
7
8-Item {
9+StyledItem {
10 id: shell
11
12+ theme.name: "Ubuntu.Components.Themes.SuruDark"
13+
14 // to be set from outside
15 property int orientationAngle: 0
16 property int orientation
17@@ -171,7 +173,6 @@
18 }
19
20 Component.onCompleted: {
21- theme.name = "Ubuntu.Components.Themes.SuruDark"
22 finishStartUpTimer.start();
23 }
24

Subscribers

People subscribed via source and target branches