diff options
| -rw-r--r-- | calendar/ChangeLog | 5 | ||||
| -rw-r--r-- | calendar/gui/e-day-view.c | 19 | ||||
| -rw-r--r-- | calendar/gui/e-week-view.c | 5 |
3 files changed, 19 insertions, 10 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 63b953e4e0..d703c1f2a8 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,8 @@ +2000-06-21 Christopher James Lahey <clahey@helixcode.com> + + * gui/e-day-view.c, gui/e-week-view.c: Remove the usage of the "x" + and "y" arguments. + 2000-06-21 Damon Chaplin <damon@helixcode.com> * gui/gnome-cal.c (gnome_calendar_direction): changed so it keeps the diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index c330b96c4a..50d9fb5ec4 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -40,6 +40,7 @@ #include "popup-menu.h" #include "../e-util/e-canvas.h" #include "../widgets/e-text/e-text.h" +#include "e-util/e-canvas-utils.h" /* Images */ #include "bell.xpm" @@ -3436,11 +3437,11 @@ e_day_view_reshape_long_event (EDayView *day_view, text_w = MAX (text_w, 0); gnome_canvas_item_set (event->canvas_item, - "x", (gdouble) text_x, - "y", (gdouble) item_y, "clip_width", (gdouble) text_w, "clip_height", (gdouble) item_h, NULL); + e_canvas_item_move_absolute(event->canvas_item, + text_x, item_y); } @@ -3747,11 +3748,11 @@ e_day_view_reshape_day_event (EDayView *day_view, item_w = MAX (item_w, 0); gnome_canvas_item_set (event->canvas_item, - "x", (gdouble) item_x, - "y", (gdouble) item_y, "clip_width", (gdouble) item_w, "clip_height", (gdouble) item_h, NULL); + e_canvas_item_move_absolute(event->canvas_item, + item_x, item_y); } } @@ -5036,11 +5037,12 @@ e_day_view_update_top_canvas_drag (EDayView *day_view, font = GTK_WIDGET (day_view)->style->font; gnome_canvas_item_set (day_view->drag_long_event_item, "font_gdk", font, - "x", item_x + E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH + E_DAY_VIEW_LONG_EVENT_X_PAD, - "y", item_y + E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + E_DAY_VIEW_LONG_EVENT_Y_PAD, "clip_width", item_w - (E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH + E_DAY_VIEW_LONG_EVENT_X_PAD) * 2, "clip_height", item_h - (E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + E_DAY_VIEW_LONG_EVENT_Y_PAD) * 2, NULL); + e_canvas_item_move_absolute(day_view->drag_long_event_item, + item_x + E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH + E_DAY_VIEW_LONG_EVENT_X_PAD, + item_y + E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + E_DAY_VIEW_LONG_EVENT_Y_PAD); if (!(day_view->drag_long_event_rect_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE)) { gnome_canvas_item_raise_to_top (day_view->drag_long_event_rect_item); @@ -5185,11 +5187,12 @@ e_day_view_update_main_canvas_drag (EDayView *day_view, font = GTK_WIDGET (day_view)->style->font; gnome_canvas_item_set (day_view->drag_item, "font_gdk", font, - "x", item_x + E_DAY_VIEW_BAR_WIDTH + E_DAY_VIEW_EVENT_X_PAD, - "y", item_y + E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD, "clip_width", item_w - E_DAY_VIEW_BAR_WIDTH - E_DAY_VIEW_EVENT_X_PAD * 2, "clip_height", item_h - (E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD) * 2, NULL); + e_canvas_item_move_absolute(event->canvas_item, + item_x + E_DAY_VIEW_BAR_WIDTH + E_DAY_VIEW_EVENT_X_PAD, + item_y + E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD); if (!(day_view->drag_bar_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE)) { gnome_canvas_item_raise_to_top (day_view->drag_bar_item); diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 45f209885b..2869847299 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -40,6 +40,7 @@ #include "popup-menu.h" #include "../e-util/e-canvas.h" #include "../widgets/e-text/e-text.h" +#include "e-util/e-canvas-utils.h" /* Images */ #include "bell.xpm" @@ -2089,11 +2090,11 @@ e_week_view_reshape_event_span (EWeekView *week_view, text_w = MAX (text_w, 0); gnome_canvas_item_set (span->text_item, - "x", (gdouble) text_x, - "y", (gdouble) text_y, "clip_width", (gdouble) text_w, "clip_height", (gdouble) text_h, NULL); + e_canvas_item_move_absolute(span->text_item, + text_x, text_y); } |