diff options
Diffstat (limited to 'libnautilus-private/nautilus-icon-text-item.c')
| -rw-r--r-- | libnautilus-private/nautilus-icon-text-item.c | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/libnautilus-private/nautilus-icon-text-item.c b/libnautilus-private/nautilus-icon-text-item.c index d1cf5388e..af72de11d 100644 --- a/libnautilus-private/nautilus-icon-text-item.c +++ b/libnautilus-private/nautilus-icon-text-item.c @@ -17,8 +17,8 @@ #include "nautilus-theme.h" #include <libnautilus/nautilus-undo.h> -#include "nautilus-gdk-extensions.h" -#include "nautilus-glib-extensions.h" +#include <eel/eel-gdk-extensions.h> +#include <eel/eel-glib-extensions.h> #include <math.h> #include <stdio.h> @@ -305,10 +305,10 @@ iti_destroy (GtkObject *object) /* Queue redraw of bounding box */ gnome_canvas_request_redraw (item->canvas, - nautilus_round (item->x1), - nautilus_round (item->y1), - nautilus_round (item->x2), - nautilus_round (item->y2)); + eel_round (item->x1), + eel_round (item->y1), + eel_round (item->x2), + eel_round (item->y2)); /* Free everything */ if (iti->font) @@ -411,16 +411,16 @@ iti_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags) (* parent_class->update) (item, affine, clip_path, flags); gnome_canvas_request_redraw (item->canvas, - nautilus_round (item->x1), - nautilus_round (item->y1), - nautilus_round (item->x2), - nautilus_round (item->y2)); + eel_round (item->x1), + eel_round (item->y1), + eel_round (item->x2), + eel_round (item->y2)); recompute_bounding_box (iti); gnome_canvas_request_redraw (item->canvas, - nautilus_round (item->x1), - nautilus_round (item->y1), - nautilus_round (item->x2), - nautilus_round (item->y2)); + eel_round (item->x1), + eel_round (item->y1), + eel_round (item->x2), + eel_round (item->y2)); } /* utility to fetch a color from a theme */ @@ -607,11 +607,11 @@ iti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int update iti = ITI (item); - width = nautilus_round (item->x2 - item->x1); - height = nautilus_round (item->y2 - item->y1); + width = eel_round (item->x2 - item->x1); + height = eel_round (item->y2 - item->y1); - xofs = nautilus_round (item->x1) - x; - yofs = nautilus_round (item->y1) - y; + xofs = eel_round (item->x1) - x; + yofs = eel_round (item->y1) - y; style = GTK_WIDGET (item->canvas)->style; @@ -693,15 +693,15 @@ iti_render (GnomeCanvasItem *item, GnomeCanvasBuf *buffer) visual = gdk_visual_get_system (); art_affine_identity(affine); - width = nautilus_round (item->x2 - item->x1); - height = nautilus_round (item->y2 - item->y1); + width = eel_round (item->x2 - item->x1); + height = eel_round (item->y2 - item->y1); /* allocate a pixmap to draw the text into, and clear it to white */ pixmap = gdk_pixmap_new (NULL, width, height, visual->depth); gc = gdk_gc_new (pixmap); - gdk_rgb_gc_set_foreground (gc, NAUTILUS_RGB_COLOR_WHITE); + gdk_rgb_gc_set_foreground (gc, EEL_RGB_COLOR_WHITE); gdk_draw_rectangle (pixmap, gc, TRUE, 0, 0, width, @@ -709,7 +709,7 @@ iti_render (GnomeCanvasItem *item, GnomeCanvasBuf *buffer) gdk_gc_unref (gc); /* use a common routine to draw the label into the pixmap */ - iti_draw (item, pixmap, nautilus_round (item->x1), nautilus_round (item->y1), width, height); + iti_draw (item, pixmap, eel_round (item->x1), eel_round (item->y1), width, height); /* turn it into a pixbuf */ colormap = gdk_colormap_new (visual, FALSE); @@ -724,7 +724,7 @@ iti_render (GnomeCanvasItem *item, GnomeCanvasBuf *buffer) gdk_pixmap_unref (pixmap); /* draw the pixbuf containing the label */ - draw_pixbuf_aa (text_pixbuf, buffer, affine, nautilus_round (item->x1), nautilus_round (item->y1)); + draw_pixbuf_aa (text_pixbuf, buffer, affine, eel_round (item->x1), eel_round (item->y1)); gdk_pixbuf_unref (text_pixbuf); buffer->is_bg = FALSE; @@ -915,7 +915,7 @@ iti_ensure_focus (GnomeCanvasItem *item) toplevel = gtk_widget_get_toplevel (GTK_WIDGET (item->canvas)); if (toplevel != NULL && GTK_WIDGET_REALIZED (toplevel)) { - nautilus_gdk_window_focus (toplevel->window, GDK_CURRENT_TIME); + eel_gdk_window_focus (toplevel->window, GDK_CURRENT_TIME); } } @@ -1063,8 +1063,8 @@ iti_event (GnomeCanvasItem *item, GdkEvent *event) if (event->button.button == 1) { gnome_canvas_w2c_d (item->canvas, event->button.x, event->button.y, &cx, &cy); idx = iti_idx_from_x_y (iti, - nautilus_round (cx - (item->x1 + MARGIN_X)), - nautilus_round (cy - (item->y1 + MARGIN_Y))); + eel_round (cx - (item->x1 + MARGIN_X)), + eel_round (cy - (item->y1 + MARGIN_Y))); iti_start_selecting (iti, idx, event->button.time); } return TRUE; @@ -1076,8 +1076,8 @@ iti_event (GnomeCanvasItem *item, GdkEvent *event) gtk_widget_event (GTK_WIDGET (priv->entry), event); gnome_canvas_w2c_d (item->canvas, event->button.x, event->button.y, &cx, &cy); idx = iti_idx_from_x_y (iti, - nautilus_round (cx - (item->x1 + MARGIN_X)), - nautilus_round (cy - (item->y1 + MARGIN_Y))); + eel_round (cx - (item->x1 + MARGIN_X)), + eel_round (cy - (item->y1 + MARGIN_Y))); iti_selection_motion (iti, idx); return TRUE; |