← Back to branch summary

~pkunal-parmar/ubuntu-calendar-app/Minor-Performance

« back to all changes in this revision

Viewing changes to TimeLineBaseComponent.qml

  • Committer: Kunal Parmar
  • Date: 2014-06-18 13:03:08 UTC
  • mfrom: (328 trunk)
  • mto: This revision was merged to the branch mainline in revision 354.
  • Revision ID: pkunal.parmar@gmail.com-20140618130308-kxzj484wzn31f1bg
merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
TimeLineBaseComponent.qml
10
10
    id: root
11
11
 
12
12
    property var startDay: DateExt.today();
 
13
    property bool isActive: false
13
14
    property alias contentY: timeLineView.contentY
14
15
    property alias contentInteractive: timeLineView.interactive
15
16
 
142
143
    Component {
143
144
        id: comp
144
145
        EventBubble {
145
 
            type: {
146
 
                if( root.type == ViewType.ViewTypeWeek ) {
147
 
                    narrowType
148
 
                } else {
149
 
                    wideType
150
 
                }
151
 
            }
152
 
            anchors.left: parent.left
153
 
            anchors.right: parent.right
154
 
            anchors.leftMargin: units.gu(0.1)
155
 
            anchors.rightMargin: units.gu(0.1)
156
 
            flickable: timeLineView
 
146
            type: root.type == ViewType.ViewTypeWeek ? narrowType : wideType
 
147
            flickable: root.isActive ? timeLineView : null
157
148
            clip: true
158
149
        }
159
150
    }