~aacid/unity8/dashviews_integration

« back to all changes in this revision

Viewing changes to tests/plugins/Dash/cardcreator/5.res

  • Committer: Albert Astals
  • Date: 2014-06-18 10:26:01 UTC
  • Revision ID: albert.astals@canonical.com-20140618102601-vdtxi8pi0p9mgldh
Make the rowHeight be the headerHeight if we have it

Shuffle a bit the margins in headerHeight/fixedHeaderHeight

Show diffs side-by-side

added added

removed removed

Lines of Context:
68
68
            visible: showHeader && status == Loader.Ready; 
69
69
            sourceComponent: ShaderEffect { 
70
70
                id: overlay; 
71
 
                height: fixedHeaderHeight != -1 ? fixedHeaderHeight : headerHeight;
 
71
                height: fixedHeaderHeight != -1 ? fixedHeaderHeight + units.gu(1) * 2 : headerHeight;
72
72
                opacity: 0.6; 
73
73
                property var source: ShaderEffectSource { 
74
74
                    id: shaderSource; 
96
96
                    }"; 
97
97
            } 
98
98
        }
99
 
readonly property int headerHeight: titleLabel.height + titleLabel.anchors.topMargin * 2 + subtitleLabel.height + subtitleLabel.anchors.topMargin;
 
99
readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;
100
100
Label { 
101
101
                    id: titleLabel; 
102
102
                    objectName: "titleLabel";