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

app: Use better icon for wayland window-backed apps

Browse Source 
For window-backed apps (read: windows we can't match to a .desktop
file), we use the window's icon property as icon. However there is
no such property on wayland (at least in the protocols we support),
so we end up with a blank actor in that case.

Do better than that, and pick a generic fallback icon instead.

https://gitlab.gnome.org/GNOME/gnome-shell/issues/1779
This commit is contained in:
Florian Müllner 2020-01-23 17:15:08 +01:00 committed by Florian Müllner
parent c2956e8bd2
commit d9b3d6745c
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/shell-app.c
View File

@ -186,7 +186,7 @@ window_backed_app_get_icon (ShellApp *app,
{ {
MetaWindow *window = NULL; MetaWindow *window = NULL;
StWidget *widget; StWidget *widget;
gint scale; int scale, scaled_size;
ShellGlobal *global; ShellGlobal *global;
StThemeContext *context; StThemeContext *context;
@ -194,7 +194,7 @@ window_backed_app_get_icon (ShellApp *app,
context = st_theme_context_get_for_stage (shell_global_get_stage (global)); context = st_theme_context_get_for_stage (shell_global_get_stage (global));
g_object_get (context, "scale-factor", &scale, NULL); g_object_get (context, "scale-factor", &scale, NULL);
size *= scale; scaled_size = size * scale;
/* During a state transition from running to not-running for /* During a state transition from running to not-running for
* window-backend apps, it's possible we get a request for the icon. * window-backend apps, it's possible we get a request for the icon.
@ -208,14 +208,28 @@ window_backed_app_get_icon (ShellApp *app,
ClutterActor *actor; ClutterActor *actor;
actor = clutter_actor_new (); actor = clutter_actor_new ();
g_object_set (actor, "opacity", 0, "width", (float) size, "height", (float) size, NULL); g_object_set (actor,
"opacity", 0,
"width", (float) scaled_size,
"height", (float) scaled_size,
NULL);
return actor; return actor;
} }
if (meta_window_get_client_type (window) == META_WINDOW_CLIENT_TYPE_X11)
{
widget = st_texture_cache_bind_cairo_surface_property (st_texture_cache_get_default (), widget = st_texture_cache_bind_cairo_surface_property (st_texture_cache_get_default (),
G_OBJECT (window), G_OBJECT (window),
"icon", "icon",
size); scaled_size);
}
else
{
widget = g_object_new (ST_TYPE_ICON,
"icon-size", size,
"icon-name", "application-x-executable",
NULL);
}
st_widget_add_style_class_name (widget, "fallback-app-icon"); st_widget_add_style_class_name (widget, "fallback-app-icon");
return CLUTTER_ACTOR (widget); return CLUTTER_ACTOR (widget);