From c77e4ecfb5041efca95c5d7297bec12afc2de16e Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Wed, 1 Apr 2020 19:32:24 -0300 Subject: [PATCH] year-view: Small code cleanup Merge update_date() with gcal_year_view_set_date(), and tidy up the code style a bit. --- src/views/gcal-year-view.c | 56 +++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/views/gcal-year-view.c b/src/views/gcal-year-view.c index 9163cd52..c61a36a5 100644 --- a/src/views/gcal-year-view.c +++ b/src/views/gcal-year-view.c @@ -578,32 +578,6 @@ update_sidebar_headers (GtkListBoxRow *row, 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 calculate_coord_for_date (GcalYearView *year_view, gint day, @@ -1761,10 +1735,36 @@ static void gcal_year_view_set_date (GcalView *view, GDateTime *date) { + GcalYearView *self; + gboolean year_changed; + gboolean needs_reset; + GCAL_ENTRY; - update_date (GCAL_YEAR_VIEW (view), date); - gcal_timeline_subscriber_range_changed (GCAL_TIMELINE_SUBSCRIBER (view)); + self = GCAL_YEAR_VIEW (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; }