From 1ddccec355a202867c860bcda611aec0a6051f7b Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 5 Nov 2007 11:56:37 +0000 Subject: ** Fix for bug #341085 2007-11-05 Milan Crha ** Fix for bug #341085 * calendar/gui/e-day-view.c: (e_day_view_reshape_day_event): Use 'x_offset' instead of changing event size when has icons. * widgets/text/e-text.c: (get_bounds), (e_text_draw): Use 'x_offset' and 'y_offset' only for text drawing, not for changing bounds of EText. svn path=/trunk/; revision=34504 --- calendar/gui/e-day-view.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'calendar/gui') diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 9422378d44..0eccaa3922 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -5867,6 +5867,7 @@ e_day_view_reshape_day_event (EDayView *day_view, /* We don't show the icons while resizing, since we'd have to draw them on top of the resize rect. */ + icons_offset = 0; num_icons = 0; if (day_view->resize_drag_pos == E_CALENDAR_VIEW_POS_NONE || day_view->resize_event_day != day @@ -5896,8 +5897,6 @@ e_day_view_reshape_day_event (EDayView *day_view, icons_offset = E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD * 2; else icons_offset = (E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD) * num_icons + E_DAY_VIEW_ICON_X_PAD; - item_x += icons_offset; - item_w -= icons_offset; } if (!event->canvas_item) { @@ -5934,6 +5933,7 @@ e_day_view_reshape_day_event (EDayView *day_view, gnome_canvas_item_set (event->canvas_item, "clip_width", (gdouble) item_w, "clip_height", (gdouble) item_h, + "x_offset", (gdouble) icons_offset, NULL); e_canvas_item_move_absolute(event->canvas_item, item_x, item_y); -- cgit v1.2.3