← Back to branch summary

~mterry/+junk/unity8

« back to all changes in this revision

Viewing changes to qml/Dash/CardFilterGrid.qml

  • 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:
qml/Dash/CardFilterGrid.qml
22
22
 
23
23
    expandable: filterGrid.expandable
24
24
    collapsedHeight: filterGrid.collapsedHeight
25
 
    margins: filterGrid.margins
26
25
    uncollapsedHeight: filterGrid.uncollapsedHeight
27
26
    originY: filterGrid.originY
28
 
    verticalSpacing: units.gu(1)
29
 
    currentItem: filterGrid.currentItem
30
27
    height: filterGrid.height
31
28
    filtered: filterGrid.filtered
32
29
 
40
37
        minimumHorizontalSpacing: units.gu(1)
41
38
        delegateWidth: cardTool.cardWidth
42
39
        delegateHeight: cardTool.cardHeight
43
 
        verticalSpacing: genericFilterGrid.verticalSpacing
 
40
        verticalSpacing: units.gu(1)
44
41
        model: genericFilterGrid.model
45
42
        collapsedRowCount: Math.min(2, cardTool && cardTool.template && cardTool.template["collapsed-rows"] || 2)
46
43
        displayMarginBeginning: genericFilterGrid.displayMarginBeginning