summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2020-02-24 09:02:30 -0500
committerMike Blumenkrantz <zmike@samsung.com>2020-02-24 09:02:30 -0500
commit697308a16f77e3e7b7dac6e74293850a3950e3d3 (patch)
tree20a8a4f09e14a2a563029591562de9244b301376
parent9cfb9aa603776464ade05be1846df56256975525 (diff)
Efl.Ui.Image: Add fallback when icon is not found in default theme
Summary: If _icon_standard_set() fails, _icon_freedesktop_set() is tried. This was causing missing icons in the homescreen example, which uses application icons which are obviously not present in the default theme. Thanks to @bu5hm4n! Test Plan: The homescreen sample application from the examples repository now correctly shows all missing icons. Reviewers: bu5hm4n, zmike Reviewed By: zmike Subscribers: cedric, #reviewers, #committers, bu5hm4n Tags: #efl Differential Revision: https://phab.enlightenment.org/D11381
-rw-r--r--src/lib/elementary/efl_ui_image.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index a13f7047fd..578dd5aa52 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -2151,6 +2151,11 @@ _internal_efl_ui_image_icon_set(Evas_Object *obj, const char *name, Eina_Bool *f
2151 { 2151 {
2152 ret = _icon_standard_set(obj, name); 2152 ret = _icon_standard_set(obj, name);
2153 if (ret && fdo) *fdo = EINA_FALSE; 2153 if (ret && fdo) *fdo = EINA_FALSE;
2154 if (!ret)
2155 {
2156 ret = _icon_freedesktop_set(obj, name, _icon_size_min_get(obj));
2157 if (ret && fdo) *fdo = EINA_TRUE;
2158 }
2154 } 2159 }
2155 else 2160 else
2156 { 2161 {