orbea
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elm_theme: Fix to set default style group name correctly 

"default" should not be appended to the group name in new EFL interface
theme. e.g. "efl/button"

Therefore, if "default" is given as a style name, then the style name
should be converted to NULL for the group name in new EFL interface
theme.
This commit is contained in:
Jaehyun Cho 2018-11-09 14:19:30 +09:00
parent a2c8330d8f
commit f66414beec
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/elementary/elm_theme.c
View File

@ -329,6 +329,9 @@ _elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *grou
if ((!clas) || !o) return EFL_UI_THEME_APPLY_FAILED;
if (!th) th = &(theme_default);
if (eina_streq(style, "default")) style = NULL;
if (is_legacy)
snprintf(buf2, sizeof(buf2), "elm/%s/%s/%s", clas, (group) ? group : "base", (style) ? style : "default");
else
@ -356,10 +359,9 @@ _elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *grou
if (!style)
return EFL_UI_THEME_APPLY_FAILED;
if (eina_streq(style, "default")) return EFL_UI_THEME_APPLY_FAILED;
// Use the elementary default style.
return (EFL_UI_THEME_APPLY_DEFAULT &
_elm_theme_set(th, o, clas, group, "default", is_legacy));
_elm_theme_set(th, o, clas, group, NULL, is_legacy));
}
Eina_Bool