Merge lp://staging/~tpeeters/ubuntu-ui-toolkit/fasterWindowColorTrunk into lp://staging/ubuntu-ui-toolkit
Proposed by
Tim Peeters
| Status: | Merged |
|---|---|
| Merged at revision: | 1287 |
| Proposed branch: | lp://staging/~tpeeters/ubuntu-ui-toolkit/fasterWindowColorTrunk |
| Merge into: | lp://staging/ubuntu-ui-toolkit |
| Diff against target: |
163 lines (+42/-27) 5 files modified
src/Ubuntu/Components/Themes/Ambiance/1.3/MainViewStyle.qml (+9/-23) src/Ubuntu/Components/plugin/ucmainviewbase.cpp (+23/-1) src/Ubuntu/Components/plugin/ucmainviewbase.h (+1/-0) src/Ubuntu/Components/plugin/ucmainviewbase_p.h (+2/-1) tests/unit/runtest.sh (+7/-2) |
| To merge this branch: | bzr merge lp://staging/~tpeeters/ubuntu-ui-toolkit/fasterWindowColorTrunk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu SDK team | Pending | ||
|
Review via email:
|
|||
Commit message
Set the window color as soon as the window is available, to avoid a flickering background when it is updated later, plus fix runtest.sh to work for xenial on arm.
Description of the change
Applied staging r1895 and r1913 to trunk.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
