diff options
| author | Jaehyun Cho <jae_hyun.cho@samsung.com> | 2018-07-18 12:10:17 +0900 |
|---|---|---|
| committer | Hermet Park <hermetpark@gmail.com> | 2018-07-18 12:10:17 +0900 |
| commit | 2916cfd86b74d76cab02242a02fd2412588c06a0 (patch) | |
| tree | f01f94b0fc140b8f56cc2d2d4f5d5457bd801f27 | |
| parent | df13fb4a7004a61a989f258b322bdeac22a4afae (diff) | |
| download | efl-2916cfd86b74d76cab02242a02fd2412588c06a0.tar.gz | |
efl_ui_layout_object: Fix not to use background/shadow part interface in legacy
Summary:
"background" and "shadow" part interface was designed to be used in efl
ui interface only.
Therefore, "background" and "shadow" part interface is not used in
legacy.
Test Plan:
Calls elm_object_part_content_set(layout, "background", content); for
legacy layout.
Reviewers: Hermet
Reviewed By: Hermet
Subscribers: cedric, #committers, zmike
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D6595
| -rw-r--r-- | src/lib/elementary/efl_ui_layout_object.c | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/src/lib/elementary/efl_ui_layout_object.c b/src/lib/elementary/efl_ui_layout_object.c index a98e5c3b57..9dc050fda1 100644 --- a/src/lib/elementary/efl_ui_layout_object.c +++ b/src/lib/elementary/efl_ui_layout_object.c @@ -2250,27 +2250,30 @@ _efl_ui_layout_object_efl_part_part_get(const Eo *obj, Efl_Ui_Layout_Object_Data // Check part type without using edje_object_part_object_get(), as this // can cause recalc, which has side effects... and could be slow. - if (eina_streq(part, "background")) + if (!elm_widget_is_legacy(obj)) { - if (efl_layout_group_part_exist_get(wd->resize_obj, "efl.background")) - type = efl_canvas_layout_part_type_get(efl_part(wd->resize_obj, "efl.background")); - if (type != EFL_CANVAS_LAYOUT_PART_TYPE_SWALLOW) + if (eina_streq(part, "background")) { - if (type < EFL_CANVAS_LAYOUT_PART_TYPE_LAST && - type > EFL_CANVAS_LAYOUT_PART_TYPE_NONE) + if (efl_layout_group_part_exist_get(wd->resize_obj, "efl.background")) + type = efl_canvas_layout_part_type_get(efl_part(wd->resize_obj, "efl.background")); + if (type != EFL_CANVAS_LAYOUT_PART_TYPE_SWALLOW) { - const char *file = NULL, *key = NULL; - efl_file_get(wd->resize_obj, &file, &key); - WRN("Layout has a background but it's not a swallow: '%s'", - elm_widget_theme_element_get(obj)); + if (type < EFL_CANVAS_LAYOUT_PART_TYPE_LAST && + type > EFL_CANVAS_LAYOUT_PART_TYPE_NONE) + { + const char *file = NULL, *key = NULL; + efl_file_get(wd->resize_obj, &file, &key); + WRN("Layout has a background but it's not a swallow: '%s'", + elm_widget_theme_element_get(obj)); + } + return efl_part_get(efl_super(obj, MY_CLASS), part); } - return efl_part_get(efl_super(obj, MY_CLASS), part); - } - return ELM_PART_IMPLEMENT(EFL_UI_LAYOUT_PART_BG_CLASS, obj, part); + return ELM_PART_IMPLEMENT(EFL_UI_LAYOUT_PART_BG_CLASS, obj, part); + } + else if (eina_streq(part, "shadow")) + return efl_part_get(efl_super(obj, MY_CLASS), part); } - else if (eina_streq(part, "shadow")) - return efl_part_get(efl_super(obj, MY_CLASS), part); if (!efl_layout_group_part_exist_get(wd->resize_obj, part)) { |