diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-03-07 09:27:31 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-03-17 20:49:12 +0800 |
| commit | 3b205698762afcd86ac79595960253d84aff5487 (patch) | |
| tree | f0f1ae05b5bd7fbd0008dbd8dbdd10908ebc1c6c /calendar/gui/e-week-view-titles-item.c | |
| parent | 5a7097278a6f6eb2a984d9e0c742342135971c35 (diff) | |
| download | gsoc2013-evolution-3b205698762afcd86ac79595960253d84aff5487.tar gsoc2013-evolution-3b205698762afcd86ac79595960253d84aff5487.tar.gz gsoc2013-evolution-3b205698762afcd86ac79595960253d84aff5487.tar.bz2 gsoc2013-evolution-3b205698762afcd86ac79595960253d84aff5487.tar.lz gsoc2013-evolution-3b205698762afcd86ac79595960253d84aff5487.tar.xz gsoc2013-evolution-3b205698762afcd86ac79595960253d84aff5487.tar.zst gsoc2013-evolution-3b205698762afcd86ac79595960253d84aff5487.zip | |
Convert all "week-start-day" properties to GDateWeekday.
Diffstat (limited to 'calendar/gui/e-week-view-titles-item.c')
| -rw-r--r-- | calendar/gui/e-week-view-titles-item.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c index 3081c5ed5d..49bbe48647 100644 --- a/calendar/gui/e-week-view-titles-item.c +++ b/calendar/gui/e-week-view-titles-item.c @@ -133,7 +133,7 @@ week_view_titles_item_draw (GnomeCanvasItem *canvas_item, GtkAllocation allocation; gboolean abbreviated; gboolean compress_weekend; - gint weekday; + GDateWeekday weekday; PangoLayout *layout; titles_item = E_WEEK_VIEW_TITLES_ITEM (canvas_item); @@ -173,9 +173,9 @@ week_view_titles_item_draw (GnomeCanvasItem *canvas_item, /* Draw the date. Set a clipping rectangle so we don't draw over the * next day. */ - weekday = week_view->display_start_day; + weekday = e_week_view_get_display_start_day (week_view); for (col = 0; col < week_view->columns; col++) { - if (weekday == 5 && compress_weekend) + if (weekday == G_DATE_SATURDAY && compress_weekend) g_snprintf ( buffer, sizeof (buffer), "%s/%s", e_get_weekday_name (G_DATE_SATURDAY, TRUE), @@ -183,7 +183,7 @@ week_view_titles_item_draw (GnomeCanvasItem *canvas_item, else g_snprintf ( buffer, sizeof (buffer), "%s", - e_get_weekday_name (weekday + 1, abbreviated)); + e_get_weekday_name (weekday, abbreviated)); cairo_save (cr); @@ -193,7 +193,7 @@ week_view_titles_item_draw (GnomeCanvasItem *canvas_item, week_view->col_widths[col], allocation.height - 2); cairo_clip (cr); - if (weekday == 5 && compress_weekend) + if (weekday == G_DATE_SATURDAY && compress_weekend) date_width = week_view->abbr_day_widths[5] + week_view->slash_width + week_view->abbr_day_widths[6]; @@ -234,12 +234,9 @@ week_view_titles_item_draw (GnomeCanvasItem *canvas_item, cairo_fill (cr); } - if (weekday == 5 && compress_weekend) - weekday += 2; - else - weekday++; - - weekday = weekday % 7; + weekday = e_weekday_get_next (weekday); + if (weekday == G_DATE_SUNDAY && compress_weekend) + weekday = e_weekday_get_next (weekday); } g_object_unref (layout); |