forked from enlightenment/efl
Revert "elm: disable interface theme loading"
This reverts commit3d07b90461
. Some commits should address the issues mentioned in T6579959571b995
fe346d2ee2
But to be honest I am still not sure exactly what the issue was? Ref T6579
This commit is contained in:
parent
6a8816b50c
commit
421217b150
|
@ -305,12 +305,12 @@ _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 ((!clas) || !o) return EFL_UI_THEME_APPLY_FAILED;
|
||||||
if (!th) th = &(theme_default);
|
if (!th) th = &(theme_default);
|
||||||
//if (is_legacy)
|
if (is_legacy)
|
||||||
snprintf(buf2, sizeof(buf2), "elm/%s/%s/%s", clas, (group) ? group : "base", (style) ? style : "default");
|
snprintf(buf2, sizeof(buf2), "elm/%s/%s/%s", clas, (group) ? group : "base", (style) ? style : "default");
|
||||||
//else
|
else
|
||||||
//snprintf(buf2, sizeof(buf2), "efl/%s%s%s%s%s", clas,
|
snprintf(buf2, sizeof(buf2), "efl/%s%s%s%s%s", clas,
|
||||||
//((group) ? group_sep : "\0"), ((group) ? group : "\0"),
|
((group) ? group_sep : "\0"), ((group) ? group : "\0"),
|
||||||
//((style) ? style_sep : "\0"), ((style) ? style : "\0"));
|
((style) ? style_sep : "\0"), ((style) ? style : "\0"));
|
||||||
if (!eina_hash_find(th->cache_style_load_failed, buf2))
|
if (!eina_hash_find(th->cache_style_load_failed, buf2))
|
||||||
{
|
{
|
||||||
file = _elm_theme_group_file_find(th, buf2);
|
file = _elm_theme_group_file_find(th, buf2);
|
||||||
|
@ -333,11 +333,11 @@ _elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *grou
|
||||||
return EFL_UI_THEME_APPLY_FAILED;
|
return EFL_UI_THEME_APPLY_FAILED;
|
||||||
|
|
||||||
// Use the elementary default style.
|
// Use the elementary default style.
|
||||||
//if (is_legacy)
|
if (is_legacy)
|
||||||
snprintf(buf2, sizeof(buf2), "elm/%s/%s/%s", clas, (group) ? group : "base", "default");
|
snprintf(buf2, sizeof(buf2), "elm/%s/%s/%s", clas, (group) ? group : "base", "default");
|
||||||
//else
|
else
|
||||||
//snprintf(buf2, sizeof(buf2), "efl/%s%s%s", clas,
|
snprintf(buf2, sizeof(buf2), "efl/%s%s%s", clas,
|
||||||
//((group) ? group_sep : "\0"), ((group) ? group : "\0"));
|
((group) ? group_sep : "\0"), ((group) ? group : "\0"));
|
||||||
if (!eina_hash_find(th->cache_style_load_failed, buf2))
|
if (!eina_hash_find(th->cache_style_load_failed, buf2))
|
||||||
{
|
{
|
||||||
file = _elm_theme_group_file_find(th, buf2);
|
file = _elm_theme_group_file_find(th, buf2);
|
||||||
|
|
Loading…
Reference in New Issue