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

views/month-view-row: Get header height during calculations

Browse Source 
This is needed for the next commit, which adds gaps between
event widgets.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/813>
This commit is contained in:
Hari Rana
2026-08-19 09:25:14 -04:00
parent fab4614a6a
commit 7886ef6f19
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/views/gcal-month-view-row.c
+4 -5
View File
@@ -1116,15 +1116,12 @@ gcal_month_view_row_size_allocate (GtkWidget *widget,
/* Event widgets */ /* Event widgets */
if (self->layout_blocks_valid) if (self->layout_blocks_valid)
{ {
gdouble cell_y[N_WEEKDAYS]; gdouble cell_y[N_WEEKDAYS] = { 0, };
guint overflows[N_WEEKDAYS] = { 0, }; guint overflows[N_WEEKDAYS] = { 0, };
guint n_events; guint n_events;
prepare_layout_blocks (self, overflows); prepare_layout_blocks (self, overflows);
for (guint i = 0; i < N_WEEKDAYS; i++)
cell_y[i] = gcal_month_cell_get_header_height (GCAL_MONTH_CELL (self->day_cells[i]));
n_events = g_list_model_get_n_items (self->events); n_events = g_list_model_get_n_items (self->events);
for (guint i = 0; i < n_events; i++) for (guint i = 0; i < n_events; i++)
@@ -1144,6 +1141,7 @@ gcal_month_view_row_size_allocate (GtkWidget *widget,
{ {
GcalEventBlock *block; GcalEventBlock *block;
GtkAllocation allocation; GtkAllocation allocation;
gint header_height;
gint start_cell; gint start_cell;
gint end_cell; gint end_cell;
@@ -1151,9 +1149,10 @@ gcal_month_view_row_size_allocate (GtkWidget *widget,
start_cell = is_ltr ? block->cell : N_WEEKDAYS - block->cell - block->length; start_cell = is_ltr ? block->cell : N_WEEKDAYS - block->cell - block->length;
end_cell = start_cell + block->length; end_cell = start_cell + block->length;
header_height = gcal_month_cell_get_header_height (GCAL_MONTH_CELL (self->day_cells[block->cell]));
allocation.x = round (start_cell * cell_width - (is_ltr ? 0 : SEPARATOR_OFFSET)); allocation.x = round (start_cell * cell_width - (is_ltr ? 0 : SEPARATOR_OFFSET));
allocation.y = cell_y[block->cell]; allocation.y = cell_y[block->cell] + header_height;
allocation.width = round (end_cell * cell_width) - allocation.x + (is_ltr ? SEPARATOR_OFFSET : 0); allocation.width = round (end_cell * cell_width) - allocation.x + (is_ltr ? SEPARATOR_OFFSET : 0);
allocation.height = block->height; allocation.height = block->height;