brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

StTextureCache: support loading a named icon with colors from a theme node

Browse Source 
Add st_texture_cache_load_icon_name_for_theme() which, when loading a
symbolic icon, gets a #StIconColors from the theme node and uses that
to colorize the icon.

https://bugzilla.gnome.org/show_bug.cgi?id=633865
This commit is contained in:
Owen W. Taylor 2010-11-02 16:12:56 -04:00
parent 04da2a61db
commit 4917c79d09
2 changed files with 134 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
src/st/st-texture-cache.c
View File

@ -127,6 +127,7 @@ typedef struct {
GtkIconInfo *icon_info; GtkIconInfo *icon_info;
gint width; gint width;
gint height; gint height;
StIconColors *colors;
gpointer user_data; gpointer user_data;
} AsyncIconLookupData; } AsyncIconLookupData;
@ -181,16 +182,49 @@ compute_pixbuf_scale (gint width,
return FALSE; return FALSE;
} }
static void
rgba_from_clutter (GdkRGBA *rgba,
ClutterColor *color)
{
rgba->red = color->red / 255.;
rgba->green = color->green / 255.;
rgba->blue = color->blue / 255.;
rgba->alpha = color->alpha / 255.;
}
static GdkPixbuf * static GdkPixbuf *
impl_load_pixbuf_gicon (GIcon *icon, impl_load_pixbuf_gicon (GIcon *icon,
GtkIconInfo *info, GtkIconInfo *info,
int size, int size,
StIconColors *colors,
GError **error) GError **error)
{ {
int scaled_width, scaled_height; int scaled_width, scaled_height;
GdkPixbuf *pixbuf = gtk_icon_info_load_icon (info, error); GdkPixbuf *pixbuf;
int width, height; int width, height;
if (colors)
{
GdkRGBA foreground_color;
GdkRGBA success_color;
GdkRGBA warning_color;
GdkRGBA error_color;
rgba_from_clutter (&foreground_color, &colors->foreground);
rgba_from_clutter (&success_color, &colors->success);
rgba_from_clutter (&warning_color, &colors->warning);
rgba_from_clutter (&error_color, &colors->error);
pixbuf = gtk_icon_info_load_symbolic (info,
&foreground_color, &success_color,
&warning_color, &error_color,
NULL, error);
}
else
{
pixbuf = gtk_icon_info_load_icon (info, error);
}
if (!pixbuf) if (!pixbuf)
return NULL; return NULL;
@ -231,6 +265,8 @@ icon_lookup_data_destroy (gpointer p)
g_free (data->mimetype); g_free (data->mimetype);
if (data->recent_info) if (data->recent_info)
gtk_recent_info_unref (data->recent_info); gtk_recent_info_unref (data->recent_info);
if (data->colors)
st_icon_colors_unref (data->colors);
g_free (data); g_free (data);
} }
@ -464,7 +500,7 @@ load_pixbuf_thread (GSimpleAsyncResult *result,
else if (data->uri) else if (data->uri)
pixbuf = impl_load_pixbuf_file (data->uri, data->width, data->height, &error); pixbuf = impl_load_pixbuf_file (data->uri, data->width, data->height, &error);
else if (data->icon) else if (data->icon)
pixbuf = impl_load_pixbuf_gicon (data->icon, data->icon_info, data->width, &error); pixbuf = impl_load_pixbuf_gicon (data->icon, data->icon_info, data->width, data->colors, &error);
else else
g_assert_not_reached (); g_assert_not_reached ();
@ -490,6 +526,7 @@ load_icon_pixbuf_async (StTextureCache *cache,
GIcon *icon, GIcon *icon,
GtkIconInfo *icon_info, GtkIconInfo *icon_info,
gint size, gint size,
StIconColors *colors,
GCancellable *cancellable, GCancellable *cancellable,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
@ -502,6 +539,10 @@ load_icon_pixbuf_async (StTextureCache *cache,
data->icon = g_object_ref (icon); data->icon = g_object_ref (icon);
data->icon_info = gtk_icon_info_copy (icon_info); data->icon_info = gtk_icon_info_copy (icon_info);
data->width = data->height = size; data->width = data->height = size;
if (colors)
data->colors = st_icon_colors_ref (colors);
else
data->colors = NULL;
data->user_data = user_data; data->user_data = user_data;
result = g_simple_async_result_new (G_OBJECT (cache), callback, user_data, load_icon_pixbuf_async); result = g_simple_async_result_new (G_OBJECT (cache), callback, user_data, load_icon_pixbuf_async);
@ -944,25 +985,11 @@ create_texture_and_ensure_request (StTextureCache *cache,
return had_pending; return had_pending;
} }
/** static ClutterActor *
* st_texture_cache_load_gicon: load_gicon_with_colors (StTextureCache *cache,
* @cache: The texture cache instance
* @icon: the #GIcon to load
* @size: Size of themed
*
* This method returns a new #ClutterActor for a given #GIcon. If the
* icon isn't loaded already, the texture will be filled
* asynchronously.
*
* This will load @icon as a full-color icon; if you want a symbolic
* icon, you must use st_texture_cache_load_icon_name().
*
* Return Value: (transfer none): A new #ClutterActor for the icon
*/
ClutterActor *
st_texture_cache_load_gicon (StTextureCache *cache,
GIcon *icon, GIcon *icon,
gint size) gint size,
StIconColors *colors)
{ {
AsyncTextureLoadData *request; AsyncTextureLoadData *request;
ClutterActor *texture; ClutterActor *texture;
@ -972,7 +999,21 @@ st_texture_cache_load_gicon (StTextureCache *cache,
GtkIconInfo *info; GtkIconInfo *info;
gicon_string = g_icon_to_string (icon); gicon_string = g_icon_to_string (icon);
key = g_strdup_printf (CACHE_PREFIX_GICON "icon=%s,size=%d", gicon_string, size); if (colors)
{
/* This raises some doubts about the practice of using string keys */
key = g_strdup_printf (CACHE_PREFIX_GICON "icon=%s,size=%d,colors=%2x%2x%2x%2x,%2x%2x%2x%2x,%2x%2x%2x%2x,%2x%2x%2x%2x",
gicon_string, size,
colors->foreground.red, colors->foreground.blue, colors->foreground.green, colors->foreground.alpha,
colors->warning.red, colors->warning.blue, colors->warning.green, colors->warning.alpha,
colors->error.red, colors->error.blue, colors->error.green, colors->error.alpha,
colors->success.red, colors->success.blue, colors->success.green, colors->success.alpha);
}
else
{
key = g_strdup_printf (CACHE_PREFIX_GICON "icon=%s,size=%d",
gicon_string, size);
}
g_free (gicon_string); g_free (gicon_string);
if (create_texture_and_ensure_request (cache, key, size, &request, &texture)) if (create_texture_and_ensure_request (cache, key, size, &request, &texture))
@ -995,7 +1036,7 @@ st_texture_cache_load_gicon (StTextureCache *cache,
request->icon_info = info; request->icon_info = info;
request->width = request->height = size; request->width = request->height = size;
load_icon_pixbuf_async (cache, icon, info, size, NULL, on_pixbuf_loaded, request); load_icon_pixbuf_async (cache, icon, info, size, colors, NULL, on_pixbuf_loaded, request);
} }
else else
{ {
@ -1012,6 +1053,29 @@ st_texture_cache_load_gicon (StTextureCache *cache,
return CLUTTER_ACTOR (texture); return CLUTTER_ACTOR (texture);
} }
/**
* st_texture_cache_load_gicon:
* @cache: The texture cache instance
* @icon: the #GIcon to load
* @size: Size of themed
*
* This method returns a new #ClutterActor for a given #GIcon. If the
* icon isn't loaded already, the texture will be filled
* asynchronously.
*
* This will load @icon as a full-color icon; if you want a symbolic
* icon, you must use st_texture_cache_load_icon_name().
*
* Return Value: (transfer none): A new #ClutterActor for the icon
*/
ClutterActor *
st_texture_cache_load_gicon (StTextureCache *cache,
GIcon *icon,
gint size)
{
return load_gicon_with_colors (cache, icon, size, NULL);
}
typedef struct { typedef struct {
gchar *path; gchar *path;
gint grid_width, grid_height; gint grid_width, grid_height;
@ -1171,19 +1235,22 @@ st_texture_cache_load_sliced_image (StTextureCache *cache,
*/ */
/** /**
* st_texture_cache_load_icon_name: * st_texture_cache_load_icon_name_for_theme:
* @cache: The texture cache instance * @cache: The texture cache instance
* @theme_node: a #StThemeNode
* @name: Name of a themed icon * @name: Name of a themed icon
* @icon_type: the type of icon to load * @icon_type: the type of icon to load
* @size: Size of themed * @size: Size of themed
* *
* Load a themed icon into a texture. See the #StIconType documentation * Load a themed icon into a texture. See the #StIconType documentation
* for an explanation of how @icon_type affects the returned icon. * for an explanation of how @icon_type affects the returned icon. The
* colors used for symbolic icons are derived from @theme_node.
* *
* Return Value: (transfer none): A new #ClutterTexture for the icon * Return Value: (transfer none): A new #ClutterTexture for the icon
*/ */
ClutterActor * ClutterActor *
st_texture_cache_load_icon_name (StTextureCache *cache, st_texture_cache_load_icon_name_for_theme (StTextureCache *cache,
StThemeNode *theme_node,
const char *name, const char *name,
StIconType icon_type, StIconType icon_type,
gint size) gint size)
@ -1206,7 +1273,12 @@ st_texture_cache_load_icon_name (StTextureCache *cache,
symbolic = g_strconcat (name, "-symbolic", NULL); symbolic = g_strconcat (name, "-symbolic", NULL);
themed = g_themed_icon_new_with_default_fallbacks ((const gchar*)symbolic); themed = g_themed_icon_new_with_default_fallbacks ((const gchar*)symbolic);
g_free (symbolic); g_free (symbolic);
if (theme_node)
texture = load_gicon_with_colors (cache, themed, size,
st_theme_node_get_icon_colors (theme_node));
else
texture = st_texture_cache_load_gicon (cache, themed, size); texture = st_texture_cache_load_gicon (cache, themed, size);
g_object_unref (themed); g_object_unref (themed);
return CLUTTER_ACTOR (texture); return CLUTTER_ACTOR (texture);
@ -1222,6 +1294,27 @@ st_texture_cache_load_icon_name (StTextureCache *cache,
} }
} }
/**
* st_texture_cache_load_icon_name:
* @cache: The texture cache instance
* @name: Name of a themed icon
* @icon_type: the type of icon to load
* @size: Size of themed
*
* Load a themed icon into a texture. See the #StIconType documentation
* for an explanation of how @icon_type affects the returned icon.
*
* Return Value: (transfer none): A new #ClutterTexture for the icon
*/
ClutterActor *
st_texture_cache_load_icon_name (StTextureCache *cache,
const char *name,
StIconType icon_type,
gint size)
{
return st_texture_cache_load_icon_name_for_theme (cache, NULL, name, icon_type, size);
}
/** /**
* st_texture_cache_load_uri_async: * st_texture_cache_load_uri_async:
* *

7
src/st/st-texture-cache.h
View File

@ -32,6 +32,7 @@
#include <clutter/clutter.h> #include <clutter/clutter.h>
#include <st/st-types.h> #include <st/st-types.h>
#include <st/st-theme-node.h>
#define ST_TYPE_TEXTURE_CACHE (st_texture_cache_get_type ()) #define ST_TYPE_TEXTURE_CACHE (st_texture_cache_get_type ())
#define ST_TEXTURE_CACHE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ST_TYPE_TEXTURE_CACHE, StTextureCache)) #define ST_TEXTURE_CACHE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ST_TYPE_TEXTURE_CACHE, StTextureCache))
@ -82,6 +83,12 @@ ClutterActor *st_texture_cache_load_icon_name (StTextureCache *cache,
StIconType icon_type, StIconType icon_type,
gint size); gint size);
ClutterActor *st_texture_cache_load_icon_name_for_theme (StTextureCache *cache,
StThemeNode *theme_node,
const char *name,
StIconType icon_type,
gint size);
ClutterActor *st_texture_cache_load_gicon (StTextureCache *cache, ClutterActor *st_texture_cache_load_gicon (StTextureCache *cache,
GIcon *icon, GIcon *icon,
gint size); gint size);