Merge lp:~davidmhewitt/wingpanel-indicator-datetime/fix-1668175 into lp:~wingpanel-devs/wingpanel-indicator-datetime/trunk

[David Hewitt]

Prevent skipping months by checking bounds of next/previous month

Previously, the indicator would try to go to the same date in the next/previous month. It didn't do any checks to see if the new month had enough days. So if you were on the last day of the month, and the next/previous month had less days, it would skip ahead 2 months.

Now, when you go to the next month, if there aren't enough days in the month, it simply selects the last day of the month instead.

=== modified file 'src/Widgets/calendar/CalendarView.vala'
--- src/Widgets/calendar/CalendarView.vala	2016-07-11 18:57:51 +0000
+++ src/Widgets/calendar/CalendarView.vala	2017-02-27 12:20:25 +0000
@@ -138,7 +138,15 @@
 
         // keep focus date on the same day of the month
         if (selected_date != null) {
-            var bumpdate = model.month_start.add_days (selected_date.get_day_of_month() - 1);
+            var month = (GLib.DateMonth)model.month_start.get_month ();
+            var year = (GLib.DateYear)model.month_start.get_year ();
+            int days_in_month = GLib.Date.get_days_in_month (month, year);
+            GLib.DateTime bumpdate;
+            if (selected_date.get_day_of_month () > days_in_month) {
+                bumpdate = model.month_start.add_days (days_in_month - 1);
+            } else {
+                bumpdate = model.month_start.add_days (selected_date.get_day_of_month() - 1);
+            }
             grid.focus_date (bumpdate);
         }
 
@@ -156,4 +164,4 @@
             return false;
         });
     }
-}
\ No newline at end of file
+}