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

[Kunal Parmar]

resolves Bug #1479533

resolves Bug #1479533

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

PASSED: Continuous integration, rev:705
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1220/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/217

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Thanks, but it still seems a bit wonky.

http://people.canonical.com/~alan/screenshots/device-2015-08-07-151138.png

review: Needs Fixing

[Kunal Parmar (pkunal-parmar)]

Thanks, I will try to improve that

[lp:~pkunal-parmar/ubuntu-calendar-app/MonthView-Indicator]

706. By Kunal Parmar on 2015-08-20

review comment

[Kunal Parmar (pkunal-parmar)]

Please check once more, I tried to adjust some parameters

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

PASSED: Continuous integration, rev:706
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1227/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/224

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Much better, thanks Kunal!

review: Approve

=== modified file 'MonthComponentDateDelegate.qml'
--- MonthComponentDateDelegate.qml	2015-06-11 12:24:41 +0000
+++ MonthComponentDateDelegate.qml	2015-08-20 12:15:22 +0000
@@ -14,10 +14,11 @@
 
     Loader {
         sourceComponent: (isToday && isCurrentMonth) || isSelected ? highLightComp : undefined
+
         onSourceComponentChanged: {
             width = Qt.binding( function() {
                 var width = dateRootItem.height > dateRootItem.width ? dateRootItem.width :dateRootItem.height
-                return ( width / 1.1 );
+                return ( width / 1.3 );
             });
             height = Qt.binding ( function() { return width} );
             anchors.centerIn = Qt.binding( function() { return dateLabel});
@@ -47,12 +48,17 @@
     }
 
     Loader{
-        width: units.gu(1)
-        height: width
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.top: dateLabel.bottom
-        anchors.topMargin: dateRootItem.height/4
         sourceComponent: showEvent ? eventIndicatorComp : undefined
+        onSourceComponentChanged: {
+            width = Qt.binding( function() { return units.gu(0.8)})
+            height = Qt.binding( function() { return width })
+            anchors.horizontalCenter = Qt.binding( function() { return  parent.horizontalCenter })
+            anchors.top = Qt.binding( function() { return parent.verticalCenter })
+            anchors.topMargin = Qt.binding( function() {
+                var w = (dateRootItem.height > dateRootItem.width ? dateRootItem.width :dateRootItem.height)/1.3
+                return (w/2) + units.gu(0.1)
+            });
+        }
     }
 
     Component{