diff options
| author | Wolfgang Ulbrich <[email protected]> | 2016-01-08 22:04:08 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2016-01-13 15:05:42 +0100 |
| commit | fa7dd4677f4196750d0c752c7b1823fdd7c54cbb (patch) | |
| tree | f9aa0f529089303d04a7f891ce22dfa94adb0a55 /libcaja-private/caja-icon-canvas-item.c | |
| parent | 390400e11e888ee65d4620a03615c5aa23e4d089 (diff) | |
| download | caja-fa7dd4677f4196750d0c752c7b1823fdd7c54cbb.tar.bz2 caja-fa7dd4677f4196750d0c752c7b1823fdd7c54cbb.tar.xz | |
GTK3 icon-container: remove useless theming properties
taken from:
https://git.gnome.org/browse/nautilus/commit/?id=e2ca42cac78cb0287a1bbb73030e7bba8b171970
Diffstat (limited to 'libcaja-private/caja-icon-canvas-item.c')
| -rw-r--r-- | libcaja-private/caja-icon-canvas-item.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/libcaja-private/caja-icon-canvas-item.c b/libcaja-private/caja-icon-canvas-item.c index 476b8839..4dcd2566 100644 --- a/libcaja-private/caja-icon-canvas-item.c +++ b/libcaja-private/caja-icon-canvas-item.c @@ -1410,7 +1410,11 @@ draw_label_text (CajaIconCanvasItem *item, GdkColor *label_color; #endif gboolean have_editable, have_additional; +#if GTK_CHECK_VERSION(3,0,0) + gboolean needs_highlight, prelight_label, is_rtl_label_beside; +#else gboolean needs_frame, needs_highlight, prelight_label, is_rtl_label_beside; +#endif EelIRect text_rect; int x; int max_text_width; @@ -1502,10 +1506,16 @@ draw_label_text (CajaIconCanvasItem *item, prepare_pango_layout_for_draw (item, editable_layout); gtk_widget_style_get (GTK_WIDGET (container), +#if !GTK_CHECK_VERSION(3,0,0) "frame_text", &needs_frame, +#endif "activate_prelight_icon_label", &prelight_label, NULL); +#if GTK_CHECK_VERSION(3,0,0) + if (!needs_highlight && details->text_width > 0 && details->text_height > 0) +#else if (needs_frame && !needs_highlight && details->text_width > 0 && details->text_height > 0) +#endif { if (!(prelight_label && item->details->is_prelit)) { @@ -2058,6 +2068,7 @@ real_map_pixbuf (CajaIconCanvasItem *icon_item) g_object_unref (old_pixbuf); } +#if !GTK_CHECK_VERSION(3,0,0) if (!icon_item->details->is_active && !icon_item->details->is_prelit && !icon_item->details->is_highlighted_for_selection @@ -2079,14 +2090,11 @@ real_map_pixbuf (CajaIconCanvasItem *icon_item) saturation, brightness, lighten, -#if GTK_CHECK_VERSION(3,0,0) - &container->details->normal_icon_color_rgba); -#else container->details->normal_icon_color_rgba); -#endif g_object_unref (old_pixbuf); } } +#endif return temp_pixbuf; } |