From: JinYong Park Date: Tue, 6 Dec 2016 13:12:55 +0000 (+0900) Subject: popup: add tizen custom signal (tizen 2.3 layout feature) X-Git-Tag: accepted/tizen/common/20170331.152656~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1c04bad0a2383116cf99e609f811117b3d3f8acd;p=platform%2Fupstream%2Felementary.git popup: add tizen custom signal (tizen 2.3 layout feature) for wearable circle theme compatibility Change-Id: I7f41df17795a373e52595ec257144cc7e81cec10 Signed-off-by: Jinyong Park --- diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c index 062b681..f23f09d 100644 --- a/src/lib/elc_popup.c +++ b/src/lib/elc_popup.c @@ -1658,7 +1658,27 @@ _elm_popup_elm_container_content_set(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, c _action_button_set(obj, content, i); } else + /* TIZEN_ONLY(20161206): support tizen custom signal (tizen_2.3) ret = eo_do_ret(_pd->main_layout, tmp, elm_obj_container_content_set(part, content)); + */ + { + if (strcmp("elm.swallow.icon", part) != 0 && + strcmp("elm.swallow.end", part) != 0) + { + const char *type; + char buf[1024]; + if (strncmp(part, "elm.swallow.", sizeof("elm.swallow.") - 1) == 0) + type = part + sizeof("elm.swallow.")-1; + else + type = part; + + snprintf(buf, sizeof(buf), "elm,state,tizen,%s,show", type); + elm_layout_signal_emit(_pd->main_layout, buf, "elm"); + } + + ret = eo_do_ret(_pd->main_layout, tmp, elm_obj_container_content_set(part, content)); + } + /* END */ _scroller_size_calc(obj); elm_layout_sizing_eval(obj); @@ -1771,6 +1791,9 @@ _elm_popup_elm_container_content_unset(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, { Evas_Object *content = NULL; unsigned int i; + /* TIZEN_ONLY(20161206): support tizen custom signal (tizen_2.3) */ + Eina_Bool tmp; + /* END */ if (!part || !strcmp(part, "default")) content = _content_unset(obj); @@ -1786,7 +1809,27 @@ _elm_popup_elm_container_content_unset(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, _button_remove(obj, i, EINA_FALSE); } else + /* TIZEN_ONLY(20161206): support tizen custom signal (tizen_2.3) goto err; + */ + { + if (strcmp("elm.swallow.icon", part) != 0 && + strcmp("elm.swallow.end", part) != 0) + { + const char *type; + char buf[1024]; + if (strncmp(part, "elm.swallow.", sizeof("elm.swallow.") - 1) == 0) + type = part + sizeof("elm.swallow.")-1; + else + type = part; + + snprintf(buf, sizeof(buf), "elm,state,tizen,%s,hide", type); + elm_layout_signal_emit(_pd->main_layout, buf, "elm"); + } + + content = eo_do_ret(_pd->main_layout, tmp, elm_obj_container_content_unset(part)); + } + /* END */ return content;