summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2018-01-17 13:59:22 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2018-01-17 14:18:17 +0900
commit421217b15019966a093ed49a34837f9535e00827 (patch)
treea7902a3a488cf43ddaa7b61ae2a90af25d36cf77
parent6a8816b50c76077e75c21827589258775a4ac3fb (diff)
Revert "elm: disable interface theme loading"
This reverts commit 3d07b90461818804ed51b6dcaed9f05c0d0155bb. Some commits should address the issues mentioned in T6579 959571b9955babc40367cf3a634dddba7a7cdcc2 fe346d2ee23eb0d9fca0544f6732c709ec3a4b8b But to be honest I am still not sure exactly what the issue was? Ref T6579
-rw-r--r--src/lib/elementary/elm_theme.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/elementary/elm_theme.c b/src/lib/elementary/elm_theme.c
index 0780265859..69028c6770 100644
--- a/src/lib/elementary/elm_theme.c
+++ b/src/lib/elementary/elm_theme.c
@@ -305,12 +305,12 @@ _elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *grou
305 305
306 if ((!clas) || !o) return EFL_UI_THEME_APPLY_FAILED; 306 if ((!clas) || !o) return EFL_UI_THEME_APPLY_FAILED;
307 if (!th) th = &(theme_default); 307 if (!th) th = &(theme_default);
308 //if (is_legacy) 308 if (is_legacy)
309 snprintf(buf2, sizeof(buf2), "elm/%s/%s/%s", clas, (group) ? group : "base", (style) ? style : "default"); 309 snprintf(buf2, sizeof(buf2), "elm/%s/%s/%s", clas, (group) ? group : "base", (style) ? style : "default");
310 //else 310 else
311 //snprintf(buf2, sizeof(buf2), "efl/%s%s%s%s%s", clas, 311 snprintf(buf2, sizeof(buf2), "efl/%s%s%s%s%s", clas,
312 //((group) ? group_sep : "\0"), ((group) ? group : "\0"), 312 ((group) ? group_sep : "\0"), ((group) ? group : "\0"),
313 //((style) ? style_sep : "\0"), ((style) ? style : "\0")); 313 ((style) ? style_sep : "\0"), ((style) ? style : "\0"));
314 if (!eina_hash_find(th->cache_style_load_failed, buf2)) 314 if (!eina_hash_find(th->cache_style_load_failed, buf2))
315 { 315 {
316 file = _elm_theme_group_file_find(th, buf2); 316 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
333 return EFL_UI_THEME_APPLY_FAILED; 333 return EFL_UI_THEME_APPLY_FAILED;
334 334
335 // Use the elementary default style. 335 // Use the elementary default style.
336 //if (is_legacy) 336 if (is_legacy)
337 snprintf(buf2, sizeof(buf2), "elm/%s/%s/%s", clas, (group) ? group : "base", "default"); 337 snprintf(buf2, sizeof(buf2), "elm/%s/%s/%s", clas, (group) ? group : "base", "default");
338 //else 338 else
339 //snprintf(buf2, sizeof(buf2), "efl/%s%s%s", clas, 339 snprintf(buf2, sizeof(buf2), "efl/%s%s%s", clas,
340 //((group) ? group_sep : "\0"), ((group) ? group : "\0")); 340 ((group) ? group_sep : "\0"), ((group) ? group : "\0"));
341 if (!eina_hash_find(th->cache_style_load_failed, buf2)) 341 if (!eina_hash_find(th->cache_style_load_failed, buf2))
342 { 342 {
343 file = _elm_theme_group_file_find(th, buf2); 343 file = _elm_theme_group_file_find(th, buf2);