From: Xavi Artigas <xavierartigas@yahoo.es>
Date: Mon, 24 Feb 2020 14:02:30 +0000 (-0500)
Subject: Efl.Ui.Image: Add fallback when icon is not found in default theme
X-Git-Tag: submit/tizen/20200303.214157~72
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b8719cfb21505487f0711abb09f58ecc2ffb6821;p=platform%2Fupstream%2Fefl.git

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
---

diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index fe006eb..142ceda 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -2167,6 +2167,11 @@ _internal_efl_ui_image_icon_set(Evas_Object *obj, const char *name, Eina_Bool *f
      {
         ret = _icon_standard_set(obj, name);
         if (ret && fdo) *fdo = EINA_FALSE;
+        if (!ret)
+          {
+             ret = _icon_freedesktop_set(obj, name, _icon_size_min_get(obj));
+             if (ret && fdo) *fdo = EINA_TRUE;
+          }
      }
    else
      {