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

[Kunal Parmar]

fixes Bug #1294681

Added parallax effect in case of long event

fixes Bug #1294681

Added parallax effect in case of long event

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

PASSED: Continuous integration, rev:221
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/339/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1864
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/339
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/339
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/173

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Looks good , and working perfectly.

Thank you Kunal.

review: Approve

=== modified file 'EventBubble.qml'
--- EventBubble.qml	2014-03-22 03:56:27 +0000
+++ EventBubble.qml	2014-03-26 14:32:35 +0000
@@ -10,6 +10,8 @@
     property int wideType: 1;
     property int narrowType: 2;
 
+    property Flickable flickable;
+
     readonly property int minimumHeight: timeLabel.height
 
     signal clicked(var event);
@@ -68,10 +70,41 @@
             if( event.displayLabel)
                 timeLabel.text = event.displayLabel;
         }
+
+        layoutBubbleDetails();
+    }
+
+    function layoutBubbleDetails() {
+        if(!flickable || flickable === undefined ) {
+            return;
+        }
+
+        if( infoBubble.y < flickable.contentY && infoBubble.height > flickable.height) {
+            var y = (flickable.contentY - infoBubble.y) * 1.2;
+            if( (y+ detailsColumn.height) > infoBubble.height) {
+                y = infoBubble.height - detailsColumn.height;
+            }
+            detailsColumn.y = y;
+        }
+    }
+
+    Connections{
+        target: flickable
+        onContentYChanged: {
+            layoutBubbleDetails();
+        }
+    }
+    Connections{
+        target: detailsColumn
+        onHeightChanged: {
+            layoutBubbleDetails();
+        }
     }
 
     Column{
+        id: detailsColumn
         width: parent.width
+
         Row{
             width: parent.width
 

=== modified file 'TimeLineBaseComponent.qml'
--- TimeLineBaseComponent.qml	2014-03-22 04:43:11 +0000
+++ TimeLineBaseComponent.qml	2014-03-26 14:32:35 +0000
@@ -95,6 +95,7 @@
             anchors.right: parent.right
             anchors.leftMargin: units.gu(0.1)
             anchors.rightMargin: units.gu(0.1)
+            flickable: timeLineView
             clip: true
         }
     }