From 2774c1c9880e5cba6c2f250570925c19236141fa Mon Sep 17 00:00:00 2001 From: David Boddie Date: Fri, 12 Jul 2019 20:04:22 +0200 Subject: [PATCH] Try to load icons from app resources first --- eek/eek-gtk-renderer.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/eek/eek-gtk-renderer.c b/eek/eek-gtk-renderer.c index b00d2361..ce46f9fb 100644 --- a/eek/eek-gtk-renderer.c +++ b/eek/eek-gtk-renderer.c @@ -60,6 +60,20 @@ eek_gtk_renderer_real_get_icon_surface (EekRenderer *self, GError *error = NULL; cairo_surface_t *surface; + gchar *path = g_strconcat("/sm/puri/squeekboard/icons/", icon_name, ".svg", NULL); + + pixbuf = gdk_pixbuf_new_from_resource_at_scale (path, size, size, + TRUE, &error); + + if (pixbuf != NULL) + goto found; + else { + g_warning ("can't get icon pixbuf for %s: %s", path, error->message); + g_error_free (error); + error = NULL; + } + g_free(path); + pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), icon_name, size, @@ -73,6 +87,7 @@ eek_gtk_renderer_real_get_icon_surface (EekRenderer *self, return NULL; } +found: surface = pixbuf_to_cairo_surface (pixbuf); g_object_unref (pixbuf); return surface;