Merge lp:~pkunal-parmar/ubuntu-calendar-app/dayviewfix_1240147 into lp:ubuntu-calendar-app

[Kunal Parmar]

Fix for chequered pattern in dayview

Fix for chequered pattern in dayview

[Mihir Soni (mihirsoni)]

Works fine :)

Thank you Kunal

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:152
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/153/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/1107
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/153
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/153
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/153
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/153

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/153/rebuild

review: Approve (continuous-integration)

=== modified file 'DayView.qml'
--- DayView.qml	2013-09-28 03:48:02 +0000
+++ DayView.qml	2013-10-16 13:22:43 +0000
@@ -39,6 +39,8 @@
             objectName: "DayViewPathBase"
 
             property var startDay: currentDay
+            //This is used to scroll all view together when currentItem scrolls
+            property var childContentY;
 
             preferredHighlightBegin: 0.5
             preferredHighlightEnd: 0.5
@@ -73,6 +75,24 @@
                 height: parent.height
                 z: index == dayViewPath.currentIndex ? 2 : 1
 
+                //get contentY value from PathView, if its not current Item
+                Binding{
+                    target: timeLineView
+                    property: "contentY"
+                    value: dayViewPath.childContentY;
+                    when: !timeLineView.PathView.isCurrentItem
+                }
+
+                //set PathView's contentY property, if its current item
+                Binding{
+                    target: dayViewPath
+                    property: "childContentY"
+                    value: contentY
+                    when: timeLineView.PathView.isCurrentItem
+                }
+
+                contentInteractive: timeLineView.PathView.isCurrentItem
+
                 startDay: getStartDay()
 
                 function getStartDay() {

=== modified file 'TimeLineBaseComponent.qml'
--- TimeLineBaseComponent.qml	2013-09-16 14:04:01 +0000
+++ TimeLineBaseComponent.qml	2013-10-16 13:22:43 +0000
@@ -7,6 +7,8 @@
     id: root
 
     property var startDay: DateExt.today();
+    property alias contentY: timeLineView.contentY
+    property alias contentInteractive: timeLineView.interactive
 
     property int type: typeWeek