Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

month-view: compare to adjusted dates

Browse Source
This commit is contained in:
Georges Basile Stavracas Neto
2016-02-17 19:09:59 +01:00
parent 4c2096ec8a
commit d87a6e5bfd
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-month-view.c
+15 -4
View File
@@ -1098,13 +1098,15 @@ gcal_month_view_size_allocate (GtkWidget *widget,
* month. Otherwise, the first cell is the 1st day of the month. * month. Otherwise, the first cell is the 1st day of the month.
*/ */
j = 1; j = 1;
date = gcal_event_get_date_start (event); date = g_date_time_to_local (gcal_event_get_date_start (event));
if (g_date_time_get_month (date) == priv->date->month) if (g_date_time_get_month (date) == priv->date->month)
j = g_date_time_get_day_of_month (date); j = g_date_time_get_day_of_month (date);
j += priv->days_delay; j += priv->days_delay;
g_clear_pointer (&date, g_date_time_unref);
/* /*
* Calculate the first cell position according to the locale * Calculate the first cell position according to the locale
* and the start date. * and the start date.
@@ -1116,7 +1118,7 @@ gcal_month_view_size_allocate (GtkWidget *widget,
* if the event is all day or not. * if the event is all day or not.
*/ */
j = icaltime_days_in_month (priv->date->month, priv->date->year); j = icaltime_days_in_month (priv->date->month, priv->date->year);
date = gcal_event_get_date_end (event); date = g_date_time_to_local (gcal_event_get_date_end (event));
if (g_date_time_get_month (date) == priv->date->month) if (g_date_time_get_month (date) == priv->date->month)
{ {
@@ -1128,6 +1130,8 @@ gcal_month_view_size_allocate (GtkWidget *widget,
} }
j += priv->days_delay; j += priv->days_delay;
g_clear_pointer (&date, g_date_time_unref);
last_cell = 7 * ((j - 1) / 7)+ 6 * priv->k + sw * ((j - 1) % 7); last_cell = 7 * ((j - 1) / 7)+ 6 * priv->k + sw * ((j - 1) % 7);
/* /*
@@ -1839,11 +1843,18 @@ static guint
gcal_month_view_get_child_cell (GcalSubscriberView *subscriber, gcal_month_view_get_child_cell (GcalSubscriberView *subscriber,
GcalEventWidget *child) GcalEventWidget *child)
{ {
GcalEvent *event;
GDateTime *dt; GDateTime *dt;
gint cell;
dt = gcal_event_widget_get_date_start (child); event = gcal_event_widget_get_event (child);
dt = g_date_time_to_local (gcal_event_get_date_start (event));
return g_date_time_get_day_of_month (dt); cell = g_date_time_get_day_of_month (dt);
g_clear_pointer (&dt, g_date_time_unref);
return cell;
} }
static void static void