← Back to branch summary

~mihirsoni/ubuntu-calendar-app/1291906

« back to all changes in this revision

Viewing changes to TimeLineBaseComponent.qml

  • Committer: Kunal Parmar
  • Date: 2014-06-10 13:53:23 UTC
  • mfrom: (315 trunk)
  • mto: This revision was merged to the branch mainline in revision 325.
  • Revision ID: pkunal.parmar@gmail.com-20140610135323-vpbfau40ro0tuqx0
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
 
141
142
    Component {
142
143
        id: comp
143
144
        EventBubble {
144
 
            type: {
145
 
                if( root.type == ViewType.ViewTypeWeek ) {
146
 
                    narrowType
147
 
                } else {
148
 
                    wideType
149
 
                }
 
145
            type: root.type == ViewType.ViewTypeWeek ? narrowType : wideType
 
146
 
 
147
            anchors{
 
148
                left: parent.left; right: parent.right
150
149
            }
151
 
            flickable: timeLineView
 
150
            flickable: root.isActive ? timeLineView : null
152
151
            clip: true
153
152
        }
154
153
    }