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

week-header: improve drag and drop

Browse Source 
The rudimentary drag n' drop support should also deal
with the following corner cases:

           All Day
Multiday |   TRUE   |   FALSE    |
         |----------|------------|
    TRUE |   utc    | no changes |
   FALSE |   utc    |    utc     |

https://bugzilla.gnome.org/show_bug.cgi?id=777424
This commit is contained in:
Georges Basile Stavracas Neto
2017-03-14 20:19:28 -03:00
parent c33d820387
commit 0dcf86b7c2
1 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/gcal-week-header.c
+40 -12
View File
@@ -1405,6 +1405,8 @@ gcal_week_header_drag_drop (GtkWidget *widget,
GcalWeekHeader *self; GcalWeekHeader *self;
g_autoptr (GDateTime) week_start; g_autoptr (GDateTime) week_start;
g_autoptr (GDateTime) dnd_date; g_autoptr (GDateTime) dnd_date;
GDateTime *start_date;
GDateTime *end_date;
GtkWidget *event_widget; GtkWidget *event_widget;
GcalEvent *event; GcalEvent *event;
gboolean ltr; gboolean ltr;
@@ -1422,30 +1424,56 @@ gcal_week_header_drag_drop (GtkWidget *widget,
/* RTL languages swap the drop cell column */ /* RTL languages swap the drop cell column */
if (!ltr) if (!ltr)
{ drop_cell = 6 - drop_cell;
drop_cell = 6 - drop_cell;
}
event = gcal_event_widget_get_event (GCAL_EVENT_WIDGET (event_widget)); event = gcal_event_widget_get_event (GCAL_EVENT_WIDGET (event_widget));
start_date = gcal_event_get_date_start (event);
end_date = gcal_event_get_date_end (event);
week_start = get_start_of_week (self->active_date); week_start = get_start_of_week (self->active_date);
dnd_date = g_date_time_add_days (week_start, drop_cell);
/* if (gcal_event_is_multiday (event) && !gcal_event_get_all_day (event))
* Set the event's start and end dates. Since the event may have a {
* NULL end date, so we have to check it here /*
*/ * The only case where we don't touch the timezone is for
gcal_event_set_all_day (event, TRUE); * timed, multiday events.
gcal_event_set_date_start (event, dnd_date); */
dnd_date = g_date_time_new (gcal_event_get_timezone (event),
g_date_time_get_year (week_start),
g_date_time_get_month (week_start),
g_date_time_get_day_of_month (week_start) + drop_cell,
g_date_time_get_hour (start_date),
g_date_time_get_minute (start_date),
0);
}
else
{
dnd_date = g_date_time_new_utc (g_date_time_get_year (week_start),
g_date_time_get_month (week_start),
g_date_time_get_day_of_month (week_start) + drop_cell,
0, 0, 0);
if (gcal_event_get_date_end (event)) gcal_event_set_all_day (event, TRUE);
}
/* Since the event may have a NULL end date, so we have to check it here */
if (end_date)
{ {
g_autoptr (GDateTime) new_end; g_autoptr (GDateTime) new_end;
GTimeSpan difference;
new_end = g_date_time_add_days (dnd_date, 1); difference = g_date_time_difference (end_date, start_date);
difference /= G_TIME_SPAN_HOUR;
new_end = g_date_time_add_hours (dnd_date, difference);
gcal_event_set_date_end (event, new_end); gcal_event_set_date_end (event, new_end);
} }
/*
* Set the start date ~after~ the end date, so we can compare
* the event's start and end dates above
*/
gcal_event_set_date_start (event, dnd_date);
/* Commit the changes */ /* Commit the changes */
gcal_manager_update_event (self->manager, event); gcal_manager_update_event (self->manager, event);