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

ShellApp: Ensure we set the size of returned texture for window backed apps

Browse Source 
Unify the two code paths too.

https://bugzilla.gnome.org/show_bug.cgi?id=648149
This commit is contained in:
Colin Walters 2011-08-11 05:56:00 -04:00
parent b0cc778c49
commit b9edb1dc01
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/shell-app.c
View File

@ -123,6 +123,18 @@ window_backed_app_get_window (ShellApp *app)
return app->running_state->windows->data; return app->running_state->windows->data;
} }
static ClutterActor *
window_backed_app_get_icon (ShellApp *app,
int size)
{
MetaWindow *window = window_backed_app_get_window (app);
ClutterActor *actor = st_texture_cache_bind_pixbuf_property (st_texture_cache_get_default (),
G_OBJECT (window),
"icon");
g_object_set (actor, "width", (float) size, "height", (float) size, NULL);
return actor;
}
/** /**
* shell_app_create_icon_texture: * shell_app_create_icon_texture:
* *
@ -141,12 +153,7 @@ shell_app_create_icon_texture (ShellApp *app,
ret = NULL; ret = NULL;
if (app->entry == NULL) if (app->entry == NULL)
{ return window_backed_app_get_icon (app, size);
MetaWindow *window = window_backed_app_get_window (app);
return st_texture_cache_bind_pixbuf_property (st_texture_cache_get_default (),
G_OBJECT (window),
"icon");
}
icon = g_app_info_get_icon (G_APP_INFO (gmenu_tree_entry_get_app_info (app->entry))); icon = g_app_info_get_icon (G_APP_INFO (gmenu_tree_entry_get_app_info (app->entry)));
if (icon != NULL) if (icon != NULL)
@ -285,13 +292,7 @@ shell_app_get_faded_icon (ShellApp *app, int size)
* app-tracked from not. * app-tracked from not.
*/ */
if (!app->entry) if (!app->entry)
{ return window_backed_app_get_icon (app, size);
MetaWindow *window = window_backed_app_get_window (app);
return st_texture_cache_bind_pixbuf_property (st_texture_cache_get_default (),
G_OBJECT (window),
"icon");
}
cache_key = g_strdup_printf ("faded-icon:%s,size=%d", shell_app_get_id (app), size); cache_key = g_strdup_printf ("faded-icon:%s,size=%d", shell_app_get_id (app), size);
data.app = app; data.app = app;