From afea64785f1fbcb9852fa520f67f3a60f303c372 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 2 Jul 2009 19:31:49 +0200 Subject: Bug #252296 - Do not preset alarm for all day events --- calendar/gui/e-day-view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'calendar/gui/e-day-view.c') diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index a0ac7098e1..ef9e9b1f23 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -4838,7 +4838,7 @@ e_day_view_add_new_event_in_selected_range (EDayView *day_view, GdkEventKey *key if (!e_cal_is_read_only (ecal, &read_only, NULL) || read_only) return FALSE; - icalcomp = e_cal_model_create_component_with_defaults (model); + icalcomp = e_cal_model_create_component_with_defaults (model, day_view->selection_in_top_canvas); if (!icalcomp) return FALSE; -- cgit v1.2.3 From 266d51479ab6bc1fb2afddf73ef275047e6ced37 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 3 Jul 2009 16:17:28 +0200 Subject: Bug #251694 - Highlight current day in a calendar --- calendar/gui/e-day-view.c | 1 + 1 file changed, 1 insertion(+) (limited to 'calendar/gui/e-day-view.c') diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index ef9e9b1f23..6099a7df5f 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -1193,6 +1193,7 @@ e_day_view_set_colors(EDayView *day_view, GtkWidget *widget) day_view->colors[E_DAY_VIEW_COLOR_BG_SELECTED] = widget->style->base[GTK_STATE_SELECTED]; day_view->colors[E_DAY_VIEW_COLOR_BG_SELECTED_UNFOCUSSED] = widget->style->bg[GTK_STATE_SELECTED]; day_view->colors[E_DAY_VIEW_COLOR_BG_GRID] = widget->style->dark[GTK_STATE_NORMAL]; + day_view->colors[E_DAY_VIEW_COLOR_BG_MULTIDAY_TODAY] = get_today_background (day_view->colors[E_DAY_VIEW_COLOR_BG_WORKING]); day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS] = widget->style->dark[GTK_STATE_NORMAL]; day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_SELECTED] = widget->style->bg[GTK_STATE_SELECTED]; day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_GRID] = widget->style->light[GTK_STATE_NORMAL]; -- cgit v1.2.3 From d11c3c7df839d8bed10c67621fd64613c0b1eb34 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 8 Jul 2009 21:16:33 +0200 Subject: Bug #238058 - Show more from summary for events with icons - do not show icons when editing event summary inline and the text is above them - move text right to icons as before when the text is on the same line as icons are --- calendar/gui/e-day-view.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'calendar/gui/e-day-view.c') diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 6099a7df5f..bcd6d42c23 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -4685,6 +4685,10 @@ e_day_view_reshape_day_event (EDayView *day_view, if (num_icons > 0) { if (item_h >= (E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD) * num_icons) icons_offset = E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD * 2; + else if (item_h <= (E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD) * 2 || num_icons == 1) + icons_offset = (E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD) * num_icons + E_DAY_VIEW_ICON_X_PAD; + else + icons_offset = E_DAY_VIEW_ICON_X_PAD; } if (!event->canvas_item) { -- cgit v1.2.3