cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a0db6b351a3f82ef80b6450e138bfbda2e558754
commit a0db6b351a3f82ef80b6450e138bfbda2e558754 Author: Mike Blumenkrantz <zm...@osg.samsung.com> Date: Fri May 25 10:14:36 2018 -0700 Revert "efl_ui_win: simplify checking theme version when adding frame" Summary: This reverts commit f37b96a1de80c6f65306c96c6ebcdc69bafdbfa1. as pointed out in D5957, this would break use of theme_set during the efl_add constructor once this is implemented in the future Reviewers: raster, cedric Reviewed By: cedric Subscribers: #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D6146 Reviewed-by: Cedric BAIL <ced...@osg.samsung.com> --- src/lib/elementary/efl_ui_win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 0deb461d10..68be870738 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -4361,7 +4361,7 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style) sd->frame_obj = edje_object_add(sd->evas); // Verify theme version. Border requires an exact theme API. - version = elm_theme_data_get(NULL, "version"); + version = elm_theme_data_get(elm_widget_theme_get(sd->obj), "version"); v = version ? atoi(version) : 0; if (EINA_LIKELY(v >= FRAME_OBJ_THEME_MIN_VERSION)) { --