diff options
| author | Milan Crha <mcrha@redhat.com> | 2009-08-01 01:45:41 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2009-08-01 01:45:41 +0800 |
| commit | 8b170a5d61c367d34ebe223c6ebe6f7be031e819 (patch) | |
| tree | fcfa6db3c2bd2dc7d2081ff926e4cc89c019ecd5 | |
| parent | bb0d4f9224ad30b43fd976a2ff9fab5385e28831 (diff) | |
| download | gsoc2013-evolution-8b170a5d61c367d34ebe223c6ebe6f7be031e819.tar gsoc2013-evolution-8b170a5d61c367d34ebe223c6ebe6f7be031e819.tar.gz gsoc2013-evolution-8b170a5d61c367d34ebe223c6ebe6f7be031e819.tar.bz2 gsoc2013-evolution-8b170a5d61c367d34ebe223c6ebe6f7be031e819.tar.lz gsoc2013-evolution-8b170a5d61c367d34ebe223c6ebe6f7be031e819.tar.xz gsoc2013-evolution-8b170a5d61c367d34ebe223c6ebe6f7be031e819.tar.zst gsoc2013-evolution-8b170a5d61c367d34ebe223c6ebe6f7be031e819.zip | |
Bug #590392 - Show selected day in day view's second timezone column
| -rw-r--r-- | calendar/gui/e-day-view-time-item.c | 6 | ||||
| -rw-r--r-- | calendar/gui/e-day-view.c | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c index 2c17e4e7d1..7d0b5a6467 100644 --- a/calendar/gui/e-day-view-time-item.c +++ b/calendar/gui/e-day-view-time-item.c @@ -134,7 +134,7 @@ e_day_view_time_item_init (EDayViewTimeItem *dvtmitem) dvtmitem->dragging_selection = FALSE; dvtmitem->second_zone = NULL; - last = calendar_config_get_day_second_zone(); + last = calendar_config_get_day_second_zone (); if (last) { if (*last) @@ -357,14 +357,14 @@ edvti_draw_zone (GnomeCanvasItem *canvas_item, gint diff; struct tm mn; - tt = icaltime_today (); + tt = icaltime_from_timet_with_zone (day_view->day_starts[0], 0, cal_zone); /* diff is number of minutes */ diff = (icaltimezone_get_utc_offset (use_zone, &tt, NULL) - icaltimezone_get_utc_offset (cal_zone, &tt, NULL) ) / 60; - tt = icaltime_today (); + tt = icaltime_from_timet_with_zone (day_view->day_starts[0], 0, cal_zone); tt.is_date = FALSE; icaltime_set_timezone (&tt, cal_zone); tt = icaltime_convert_to_zone (tt, use_zone); diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index f24d5267a4..37a4859d88 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -472,6 +472,7 @@ static void time_range_changed_cb (ECalModel *model, time_t start_time, time_t end_time, gpointer user_data) { EDayView *day_view = E_DAY_VIEW (user_data); + EDayViewTimeItem *eti; time_t lower; g_return_if_fail (E_IS_DAY_VIEW (day_view)); @@ -501,6 +502,11 @@ time_range_changed_cb (ECalModel *model, time_t start_time, time_t end_time, gpo if (day_view->selection_start_row != -1) e_day_view_ensure_rows_visible (day_view, day_view->selection_start_row, day_view->selection_start_row); + + /* update the time canvas to show proper date in it */ + eti = E_DAY_VIEW_TIME_ITEM (day_view->time_canvas_item); + if (eti && eti->second_zone) + gtk_widget_queue_draw (day_view->time_canvas); } static void |