diff options
| author | Steve Zesch <[email protected]> | 2012-11-20 19:23:06 -0800 |
|---|---|---|
| committer | Steve Zesch <[email protected]> | 2012-11-20 19:23:06 -0800 |
| commit | 4f762cdecf92c6391b27930456e40a703ea880f8 (patch) | |
| tree | c1ef23eb0a876eda9294ace5c93f6e2ddb184bfa /libcaja-private/caja-icon-canvas-item.c | |
| parent | 49c5ca823b2e18ac7524bb733f84c3549b8f359c (diff) | |
| parent | 55f7b8caf97f3eb0da4dcc1a36e4c0ba0ed200d2 (diff) | |
| download | caja-4f762cdecf92c6391b27930456e40a703ea880f8.tar.bz2 caja-4f762cdecf92c6391b27930456e40a703ea880f8.tar.xz | |
Merge pull request #50 from jasmineaura/develop
eel-bg and lc-p rendering-cleanup followups, eel-bg-box rendering-cleanup
Diffstat (limited to 'libcaja-private/caja-icon-canvas-item.c')
| -rw-r--r-- | libcaja-private/caja-icon-canvas-item.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/libcaja-private/caja-icon-canvas-item.c b/libcaja-private/caja-icon-canvas-item.c index f36f2ccf..45e6f98b 100644 --- a/libcaja-private/caja-icon-canvas-item.c +++ b/libcaja-private/caja-icon-canvas-item.c @@ -622,7 +622,7 @@ caja_icon_canvas_item_get_image (CajaIconCanvasItem *item, pixmap = gdk_pixmap_new (gdk_screen_get_root_window (screen), width, height, gdk_visual_get_depth (gdk_colormap_get_visual (colormap))); - gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), colormap); + gdk_drawable_set_colormap (pixmap, colormap); pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, @@ -690,11 +690,11 @@ caja_icon_canvas_item_get_image (CajaIconCanvasItem *item, cairo_paint (cr); cairo_destroy (cr); - draw_embedded_text (item, GDK_DRAWABLE (pixmap), + draw_embedded_text (item, pixmap, item_offset_x, item_offset_y); - draw_label_text (item, GDK_DRAWABLE (pixmap), FALSE, icon_rect); - draw_label_text (item, GDK_DRAWABLE (*mask), TRUE, icon_rect); + draw_label_text (item, pixmap, FALSE, icon_rect); + draw_label_text (item, *mask, TRUE, icon_rect); g_object_unref (pixbuf); @@ -1624,7 +1624,9 @@ draw_label_text (CajaIconCanvasItem *item, drawable, #endif needs_highlight ? GTK_STATE_SELECTED : GTK_STATE_NORMAL, +#if !GTK_CHECK_VERSION(3,0,0) NULL, +#endif GTK_WIDGET (EEL_CANVAS_ITEM (item)->canvas), "icon-container", text_rect.x0, @@ -1704,11 +1706,11 @@ get_knob_pixbuf (void) } static void -#if GTK_CHECK_VERSION(3,0,0) draw_stretch_handles (CajaIconCanvasItem *item, +#if GTK_CHECK_VERSION(3,0,0) cairo_t *cr, #else -draw_stretch_handles (CajaIconCanvasItem *item, GdkDrawable *drawable, + GdkDrawable *drawable, #endif const EelIRect *rect) { @@ -2228,7 +2230,7 @@ caja_icon_canvas_item_draw (EelCanvasItem *item, GdkDrawable *drawable, #if GTK_CHECK_VERSION(3,0,0) draw_embedded_text (icon_item, cr, icon_rect.x0, icon_rect.y0); #else - draw_embedded_text (icon_item, drawable, icon_rect.x0, icon_rect.y0); + draw_embedded_text (icon_item, drawable, icon_rect.x0, icon_rect.y0); #endif is_rtl = caja_icon_container_is_layout_rtl (CAJA_ICON_CONTAINER (item->canvas)); |