← Back to branch summary

~mterry/+junk/unity8

« back to all changes in this revision

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

  • Committer: CI bot
  • Author(s): Albert Astals
  • Date: 2014-06-23 11:16:48 UTC
  • mfrom: (942.4.17 dashviews_integration)
  • Revision ID: ps-jenkins@lists.canonical.com-20140623111648-kjvczpy41hm2dv72
Add VerticalJournal integration to Dash/scopes/QML Fixes: 1326467

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/plugins/Dash/cardcreator/2.res
46
46
                    } 
47
47
                }
48
48
readonly property size artShapeSize: Qt.size(-1, -1);
49
 
readonly property int headerHeight: row.height + row.margins * 2;
 
49
readonly property int headerHeight: row.height;
50
50
Row { 
51
51
                    id: row; 
52
52
                    objectName: "outerRow"; 
53
53
                    property real margins: units.gu(1); 
54
54
                    spacing: margins; 
 
55
                    height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight; 
55
56
                    anchors { top: parent.top; 
56
57
                                     topMargin: units.gu(1);
57
58
                    left: parent.left;