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

week-header: fix all-day events, add comments

Browse Source
This commit is contained in:
Georges Basile Stavracas Neto
2016-12-08 16:00:39 -02:00
parent 74ac2d83ee
commit 13906a3000
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/gcal-week-header.c
+5 -1
View File
@@ -1159,6 +1159,7 @@ gcal_week_header_add_event (GcalWeekHeader *self,
week_start = get_start_of_week (self->active_date); week_start = get_start_of_week (self->active_date);
week_end = get_end_of_week (self->active_date); week_end = get_end_of_week (self->active_date);
/* Retrieve the real start and end dates */
if (all_day) if (all_day)
{ {
start_date = g_date_time_ref (gcal_event_get_date_start (event)); start_date = g_date_time_ref (gcal_event_get_date_start (event));
@@ -1170,16 +1171,19 @@ gcal_week_header_add_event (GcalWeekHeader *self,
end_date = g_date_time_to_local (gcal_event_get_date_end (event)); end_date = g_date_time_to_local (gcal_event_get_date_end (event));
} }
/* Start position */
if (datetime_compare_date (start_date, week_start) >= 0) if (datetime_compare_date (start_date, week_start) >= 0)
start = (g_date_time_get_day_of_week (start_date) - get_first_weekday ()) % 7; start = (g_date_time_get_day_of_week (start_date) - get_first_weekday ()) % 7;
else else
start = 0; start = 0;
/* End position */
if (g_date_time_compare (end_date, week_end) <= 0) if (g_date_time_compare (end_date, week_end) <= 0)
end = (g_date_time_get_day_of_week (end_date) - get_first_weekday ()) % 7 - all_day; end = (g_date_time_get_day_of_week (end_date) - get_first_weekday () - all_day) % 7;
else else
end = 6; end = 6;
/* Add the event widget to the grid */
add_event_to_grid (self, event, start, end); add_event_to_grid (self, event, start, end);
/* Check if we eventually can merge events */ /* Check if we eventually can merge events */