diff options
| author | Wolfgang Ulbrich <[email protected]> | 2016-01-09 01:11:39 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2016-01-13 15:05:42 +0100 |
| commit | b03a4c4078440f3ec1baea7ea158606f3c68e277 (patch) | |
| tree | da1bdd79c82cb45038654ec7333bdacb07cc6245 | |
| parent | 288ceb4c5d5af35676031754db51cc1c5c53105f (diff) | |
| download | caja-b03a4c4078440f3ec1baea7ea158606f3c68e277.tar.bz2 caja-b03a4c4078440f3ec1baea7ea158606f3c68e277.tar.xz | |
GTK3 icon-canvas-item: use eel_create_spotlight_pixbuf()
Instead of passing eel_pixbuf_render() always the same values
taken from:
https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=a1fa4ea
| -rw-r--r-- | libcaja-private/caja-icon-canvas-item.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libcaja-private/caja-icon-canvas-item.c b/libcaja-private/caja-icon-canvas-item.c index 4dcd2566..4bfffebf 100644 --- a/libcaja-private/caja-icon-canvas-item.c +++ b/libcaja-private/caja-icon-canvas-item.c @@ -1957,7 +1957,9 @@ real_map_pixbuf (CajaIconCanvasItem *icon_item) CajaIconContainer *container; GdkPixbuf *temp_pixbuf, *old_pixbuf, *audio_pixbuf; int emblem_size; +#if !GTK_CHECK_VERSION(3,0,0) guint render_mode, saturation, brightness, lighten; +#endif temp_pixbuf = icon_item->details->pixbuf; canvas = EEL_CANVAS_ITEM(icon_item)->canvas; @@ -1970,6 +1972,10 @@ real_map_pixbuf (CajaIconCanvasItem *icon_item) { old_pixbuf = temp_pixbuf; +#if GTK_CHECK_VERSION(3,0,0) + temp_pixbuf = eel_create_spotlight_pixbuf (temp_pixbuf); + g_object_unref (old_pixbuf); +#else gtk_widget_style_get (GTK_WIDGET (container), "prelight_icon_render_mode", &render_mode, "prelight_icon_saturation", &saturation, @@ -1984,15 +1990,10 @@ real_map_pixbuf (CajaIconCanvasItem *icon_item) saturation, brightness, lighten, -#if GTK_CHECK_VERSION(3,0,0) - &container->details->prelight_icon_color_rgba); -#else container->details->prelight_icon_color_rgba); -#endif g_object_unref (old_pixbuf); } - - +#endif /* FIXME bugzilla.gnome.org 42471: This hard-wired image is inappropriate to * this level of code, which shouldn't know that the |