Unity 8

Merge lp:~saviq/unity8/fix-header-height into lp:unity8

  1. fix-header-height
  2. Merge into trunk
Proposed by Michał Sawicz
Status: Merged
Approved by: Andrea Cimitan
Approved revision: 983
Merged at revision: 994
Proposed branch: lp:~saviq/unity8/fix-header-height
Merge into: lp:unity8
Diff against target: 25 lines (+2/-2)
2 files modified
plugins/Dash/CardCreator.js (+1/-1)
tests/plugins/Dash/cardcreator/5.res (+1/-1)
To merge this branch: bzr merge lp:~saviq/unity8/fix-header-height
Reviewer Review Type Date Requested Status
Andrea Cimitan (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Unity Team Pending
Review via email: mp+224269@code.launchpad.net

Commit message

Fix dynamic overlay height.

Description of the change

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

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

 * Did you make sure that your branch does not contain spurious tags?
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
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:983
http://jenkins.qa.ubuntu.com/job/unity8-ci/3205/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1131
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/209
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/299
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/299
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/299/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/299
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1496
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1977
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1977/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8777

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) wrote :

 * 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.
Different issues from this branch

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/Dash/CardCreator.js'
2--- plugins/Dash/CardCreator.js 2014-06-23 09:16:05 +0000
3+++ plugins/Dash/CardCreator.js 2014-06-24 11:10:19 +0000
4@@ -113,7 +113,7 @@
5 visible: showHeader && status == Loader.Ready; \n\
6 sourceComponent: ShaderEffect { \n\
7 id: overlay; \n\
8- height: fixedHeaderHeight > 0 ? fixedHeaderHeight + units.gu(1) * 2 : headerHeight; \n\
9+ height: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2); \n\
10 opacity: 0.6; \n\
11 property var source: ShaderEffectSource { \n\
12 id: shaderSource; \n\
13
14=== modified file 'tests/plugins/Dash/cardcreator/5.res'
15--- tests/plugins/Dash/cardcreator/5.res 2014-06-23 09:16:05 +0000
16+++ tests/plugins/Dash/cardcreator/5.res 2014-06-24 11:10:19 +0000
17@@ -73,7 +73,7 @@
18 visible: showHeader && status == Loader.Ready;
19 sourceComponent: ShaderEffect {
20 id: overlay;
21- height: fixedHeaderHeight > 0 ? fixedHeaderHeight + units.gu(1) * 2 : headerHeight;
22+ height: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2);
23 opacity: 0.6;
24 property var source: ShaderEffectSource {
25 id: shaderSource;

Subscribers

People subscribed via source and target branches