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

year-view: Small code cleanup

Browse Source 
Merge update_date() with gcal_year_view_set_date(), and
tidy up the code style a bit.
This commit is contained in:
Georges Basile Stavracas Neto
2020-04-01 21:06:51 -03:00
parent cfa4b56a05
commit c77e4ecfb5
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/gcal-year-view.c
+28 -28
View File
@@ -578,32 +578,6 @@ update_sidebar_headers (GtkListBoxRow *row,
g_clear_pointer (&row_date, g_date_time_unref); g_clear_pointer (&row_date, g_date_time_unref);
} }
static void
update_date (GcalYearView *year_view,
GDateTime *new_date)
{
gboolean needs_reset = FALSE;
if (year_view->date &&
year_view->start_selected_date &&
!g_date_time_equal (year_view->date, new_date))
{
needs_reset = TRUE;
}
gcal_set_date_time (&year_view->date, new_date);
year_view->first_week_of_year = get_last_week_of_year_dmy (year_view->first_weekday,
1, G_DATE_JANUARY,
g_date_time_get_year (year_view->date));;
year_view->last_week_of_year = get_last_week_of_year_dmy (year_view->first_weekday,
31, G_DATE_DECEMBER,
g_date_time_get_year (year_view->date));
if (needs_reset)
reset_sidebar (year_view);
}
static void static void
calculate_coord_for_date (GcalYearView *year_view, calculate_coord_for_date (GcalYearView *year_view,
gint day, gint day,
@@ -1761,10 +1735,36 @@ static void
gcal_year_view_set_date (GcalView *view, gcal_year_view_set_date (GcalView *view,
GDateTime *date) GDateTime *date)
{ {
GcalYearView *self;
gboolean year_changed;
gboolean needs_reset;
GCAL_ENTRY; GCAL_ENTRY;
update_date (GCAL_YEAR_VIEW (view), date); self = GCAL_YEAR_VIEW (view);
gcal_timeline_subscriber_range_changed (GCAL_TIMELINE_SUBSCRIBER (view));
needs_reset = self->date &&
self->start_selected_date &&
!g_date_time_equal (self->date, date);
year_changed = !self->date || g_date_time_get_year (self->date) != g_date_time_get_year (date);
gcal_set_date_time (&self->date, date);
self->first_week_of_year = get_last_week_of_year_dmy (self->first_weekday,
1,
G_DATE_JANUARY,
g_date_time_get_year (self->date));
self->last_week_of_year = get_last_week_of_year_dmy (self->first_weekday,
31,
G_DATE_DECEMBER,
g_date_time_get_year (self->date));
if (needs_reset)
reset_sidebar (self);
if (year_changed)
gcal_timeline_subscriber_range_changed (GCAL_TIMELINE_SUBSCRIBER (view));
GCAL_EXIT; GCAL_EXIT;
} }