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

month-view-row: Clamp last cell to [first cell, 6]

Browse Source 
This is not ideal but it's what we've got for now.

Closes: https://gitlab.gnome.org/GNOME/gnome-calendar/-/issues/1083
This commit is contained in:
Georges Basile Stavracas Neto
2023-09-02 10:26:41 -03:00
parent 7ae5765788
commit b0813fb605
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/views/gcal-month-view-row.c
+11 -11
View File
@@ -113,22 +113,22 @@ calculate_event_cells (GcalMonthViewRow *self,
gint *out_first_cell, gint *out_first_cell,
gint *out_last_cell) gint *out_last_cell)
{ {
g_autoptr (GDateTime) range_start = NULL;
g_autoptr (GDateTime) start_date = NULL;
gboolean all_day; gboolean all_day;
gint first_cell;
g_assert (out_first_cell != NULL || out_last_cell != NULL);
all_day = gcal_event_get_all_day (event); all_day = gcal_event_get_all_day (event);
range_start = gcal_range_get_start (self->range);
start_date = gcal_event_get_date_start (event);
start_date = all_day ? g_date_time_ref (start_date) : g_date_time_to_local (start_date);
first_cell = MAX (gcal_date_time_compare_date (start_date, range_start), 0);
/* Start date */ /* Start date */
if (out_first_cell) if (out_first_cell)
{ *out_first_cell = first_cell;
g_autoptr (GDateTime) range_start = NULL;
g_autoptr (GDateTime) start_date = NULL;
range_start = gcal_range_get_start (self->range);
start_date = gcal_event_get_date_start (event);
start_date = all_day ? g_date_time_ref (start_date) : g_date_time_to_local (start_date);
*out_first_cell = MAX (gcal_date_time_compare_date (start_date, range_start), 0);
}
/* /*
* The logic for the end date is the same, except that we have to check * The logic for the end date is the same, except that we have to check
@@ -149,7 +149,7 @@ calculate_event_cells (GcalMonthViewRow *self,
if (all_day) if (all_day)
last_cell--; last_cell--;
*out_last_cell = MIN (last_cell, 6); *out_last_cell = CLAMP (last_cell, first_cell, 6);
} }
} }