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

[Kunal Parmar]

Resolves Bug #1371869
Event bubbles: do not cut off text vertically

Resolves Bug #1371869
Event bubbles: do not cut off text vertically

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

PASSED: Continuous integration, rev:512
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/937/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1084
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1084/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/495

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Looks good to me.
Thanks Kunal.

review: Approve

=== modified file 'EventBubble.qml'
--- EventBubble.qml	2014-10-20 14:41:19 +0000
+++ EventBubble.qml	2014-10-20 21:39:22 +0000
@@ -61,51 +61,7 @@
 
     onEventChanged: {
         resize();
-        setDetails();
-    }
-
-    Component.onCompleted: {
-        setDetails();
-    }
-
-    function setDetails() {
-        if(event === null || event === undefined) {
-            return;
-        }
-
-        var startTime = event.startDateTime.toLocaleTimeString(Qt.locale(), Locale.ShortFormat)
-        var endTime = event.endDateTime.toLocaleTimeString(Qt.locale(), Locale.ShortFormat)
-
-        // TRANSLATORS: the first argument (%1) refers to a start time for an event,
-        // while the second one (%2) refers to the end time
-        var timeString = i18n.tr("%1 - %2").arg(startTime).arg(endTime)
-
-        if (type === wideType) {
-            eventDetails.item.timeLableText= ""
-            eventDetails.item.titleLabelText = ""
-            eventDetails.item.descriptionText.text = ""
-            //height is less then set only event title
-            if( height > minimumHeight ) {
-                //on wide type show all details
-                eventDetails.item.timeLableText = timeString
-                if (event.displayLabel)
-                    eventDetails.item.titleLabelText = event.displayLabel;
-                if (event.description)
-                {
-                    eventDetails.item.descriptionText= event.description
-                    //If content is too much don't display.
-                    if (height < descriptionLabel.height + descriptionLabel.y) {
-                        eventDetails.item.descriptionText.text = ""
-                    }
-                }
-                layoutBubbleDetails();
-
-            } else {
-                if (event.displayLabel)
-                    eventDetails.item.timeLableText = event.displayLabel;
-            }
-        }
-        if (model) {
+        if (model && event ) {
             var collection = model.collection( event.collectionId );
             bg.color = collection.color
         }
@@ -151,7 +107,7 @@
                     top: parent.top
                     left: parent.left
                     right: parent.right
-                    margins: units.gu(1)
+                    margins: units.gu(0.5)
                 }
 
                 Label {
@@ -161,7 +117,6 @@
                     fontSize:"small"
                     font.bold: true
                     width: parent.width
-
                 }
 
                 Label {
@@ -178,7 +133,6 @@
                     color: "White"
                     fontSize: "x-small"
                     width: parent.width
-                    visible: type == wideType
                 }
             }
 
@@ -199,6 +153,53 @@
                         flickable.onContentYChanged.connect(layoutBubbleDetails);
                     }
                 }
+
+                onEventChanged: {
+                    setDetails();
+                }
+            }
+
+            function setDetails() {
+                if(event === null || event === undefined) {
+                    return;
+                }
+
+                var startTime = event.startDateTime.toLocaleTimeString(Qt.locale(), Locale.ShortFormat)
+                var endTime = event.endDateTime.toLocaleTimeString(Qt.locale(), Locale.ShortFormat)
+
+                if (type === wideType) {
+                    timeLableText= ""
+                    titleLabelText = ""
+                    descriptionText.text = ""
+                    //height is less then set only event title
+                    if( infoBubble.height > minimumHeight ) {
+                        //on wide type show all details
+                        if( infoBubble.height > titleLabel.y + titleLabel.height + units.gu(1)) {
+                            // TRANSLATORS: the first argument (%1) refers to a start time for an event,
+                            // while the second one (%2) refers to the end time
+                            var timeString = i18n.tr("%1 - %2").arg(startTime).arg(endTime)
+                            timeLableText = timeString
+                            titleLabelText = event.displayLabel
+                        } else if ( event.displayLabel ) {
+                            // TRANSLATORS: the first argument (%1) refers to a start time for an event,
+                            // while the second one (%2) refers to title of event
+                            timeLableText = i18n.tr("%1 - %2").arg(startTime).arg(event.displayLabel);
+                        }
+
+                        if (event.description) {
+                            descriptionText = event.description
+                            //descriptionText = event.description
+                            //If content is too much don't display.
+                            if (infoBubble.height < descriptionLabel.y + descriptionLabel.height + units.gu(1)) {
+                                descriptionText = ""
+                            }
+                        }
+
+                        layoutBubbleDetails();
+                    } else if (event.displayLabel){
+                        eventDetails.item.timeLableText = event.displayLabel;
+                    }
+                }
             }
         }
     }