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

gcal-week-grid: Make DnD highlight area height match event's duration

Browse Source 
Fixes issue #1341
This commit is contained in:
Vishruth-Thimmaiah
2025-04-21 19:40:30 +00:00
committed by Georges Basile Stavracas Neto
parent 33aae54b32
commit 749d7e96e8
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/views/gcal-week-grid.c
+16 -2
View File
@@ -74,6 +74,7 @@ struct _GcalWeekGrid
struct { struct {
gint cell; gint cell;
GtkWidget *widget; GtkWidget *widget;
gint event_minutes;
} dnd; } dnd;
GcalContext *context; GcalContext *context;
@@ -487,8 +488,19 @@ on_drop_target_motion_cb (GtkDropTarget *drop_target,
GcalWeekGrid *self) GcalWeekGrid *self)
{ {
GCAL_ENTRY; GCAL_ENTRY;
GcalEventWidget *event_widget;
const GValue *value;
GDateTime *start, *end;
self->dnd.cell = get_dnd_cell (self, x, y); self->dnd.cell = get_dnd_cell (self, x, y);
value = gtk_drop_target_get_value (drop_target);
event_widget = g_value_get_object (value);
start = gcal_event_widget_get_date_start (event_widget);
end = gcal_event_widget_get_date_end (event_widget);
self->dnd.event_minutes = g_date_time_difference (end, start) / G_TIME_SPAN_MINUTE;
gtk_widget_queue_allocate (GTK_WIDGET (self)); gtk_widget_queue_allocate (GTK_WIDGET (self));
GCAL_RETURN (GDK_ACTION_COPY); GCAL_RETURN (GDK_ACTION_COPY);
@@ -665,12 +677,13 @@ gcal_week_grid_size_allocate (GtkWidget *widget,
if (gtk_widget_should_layout (self->dnd.widget)) if (gtk_widget_should_layout (self->dnd.widget))
{ {
gdouble cell_height; gdouble cell_height, event_height;
gint column, row; gint column, row;
g_assert (self->dnd.cell != -1); g_assert (self->dnd.cell != -1);
cell_height = minutes_height * 30; cell_height = minutes_height * 30;
event_height = minutes_height * self->dnd.event_minutes;
column = self->dnd.cell / (MINUTES_PER_DAY / 30); column = self->dnd.cell / (MINUTES_PER_DAY / 30);
row = self->dnd.cell - column * 48; row = self->dnd.cell - column * 48;
@@ -679,7 +692,7 @@ gcal_week_grid_size_allocate (GtkWidget *widget,
.x = column * column_width, .x = column * column_width,
.y = row * cell_height, .y = row * cell_height,
.width = column_width, .width = column_width,
.height = cell_height, .height = event_height,
}, },
baseline); baseline);
} }
@@ -876,6 +889,7 @@ gcal_week_grid_init (GcalWeekGrid *self)
gtk_widget_add_controller (GTK_WIDGET (self), self->motion_controller); gtk_widget_add_controller (GTK_WIDGET (self), self->motion_controller);
drop_target = gtk_drop_target_new (GCAL_TYPE_EVENT_WIDGET, GDK_ACTION_COPY); drop_target = gtk_drop_target_new (GCAL_TYPE_EVENT_WIDGET, GDK_ACTION_COPY);
gtk_drop_target_set_preload (drop_target, TRUE);
g_signal_connect (drop_target, "drop", G_CALLBACK (on_drop_target_drop_cb), self); g_signal_connect (drop_target, "drop", G_CALLBACK (on_drop_target_drop_cb), self);
g_signal_connect (drop_target, "enter", G_CALLBACK (on_drop_target_enter_cb), self); g_signal_connect (drop_target, "enter", G_CALLBACK (on_drop_target_enter_cb), self);
g_signal_connect (drop_target, "leave", G_CALLBACK (on_drop_target_leave_cb), self); g_signal_connect (drop_target, "leave", G_CALLBACK (on_drop_target_leave_cb), self);