diff options
| author | Wolfgang Ulbrich <[email protected]> | 2016-01-05 19:56:52 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2016-01-13 15:05:41 +0100 |
| commit | 11fe5df21deec3181bbb72a577a26f7d2bb4d8b0 (patch) | |
| tree | 9dea246ecb9172556a1e01530340f2bcb3200aef /libcaja-private/caja-icon-private.h | |
| parent | dca1155b3473e91ef12b03dca1506b86ccbaba07 (diff) | |
| download | caja-11fe5df21deec3181bbb72a577a26f7d2bb4d8b0.tar.bz2 caja-11fe5df21deec3181bbb72a577a26f7d2bb4d8b0.tar.xz | |
GTK3 icon-container: port to GtkStyleContext
taken from:
https://git.gnome.org/browse/nautilus/commit/?id=4f23a0a
Diffstat (limited to 'libcaja-private/caja-icon-private.h')
| -rw-r--r-- | libcaja-private/caja-icon-private.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/libcaja-private/caja-icon-private.h b/libcaja-private/caja-icon-private.h index cf7ef592..0c36188f 100644 --- a/libcaja-private/caja-icon-private.h +++ b/libcaja-private/caja-icon-private.h @@ -211,6 +211,17 @@ struct CajaIconContainerDetails int font_size_table[CAJA_ZOOM_LEVEL_LARGEST + 1]; /* pixbuf and color for label highlighting */ +#if GTK_CHECK_VERSION(3,0,0) + GdkRGBA highlight_color_rgba; + GdkRGBA active_color_rgba; + GdkRGBA normal_color_rgba; + GdkRGBA prelight_color_rgba; + GdkRGBA prelight_icon_color_rgba; + GdkRGBA normal_icon_color_rgba; + + /* colors for text labels */ + GdkRGBA label_colors [LAST_LABEL_COLOR]; +#else guint32 highlight_color_rgba; guint32 active_color_rgba; guint32 normal_color_rgba; @@ -220,6 +231,7 @@ struct CajaIconContainerDetails /* colors for text labels */ GdkColor label_colors [LAST_LABEL_COLOR]; +#endif /* State used so arrow keys don't wander if icons aren't lined up. */ @@ -327,7 +339,11 @@ void caja_icon_container_update_scroll_region (CajaIconContainer /* label color for items */ void caja_icon_container_get_label_color (CajaIconContainer *container, +#if GTK_CHECK_VERSION(3,0,0) + GdkRGBA *color, +#else GdkColor **color, +#endif gboolean first_line, gboolean needs_highlight, gboolean is_prelit); |