From: Jeonghyun Yun Date: Thu, 9 Nov 2017 01:19:17 +0000 (+0900) Subject: elm_panel: show and hide necessary object when scrollable is set X-Git-Tag: submit/tizen_4.0/20171115.064852~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ac954829ab8407cda9487517817a066de2ae102b;p=platform%2Fupstream%2Felementary.git elm_panel: show and hide necessary object when scrollable is set @tizen_fix Change-Id: I229f9872551a5ba656c9fd91a1f62b34db282824 Signed-off-by: Jeonghyun Yun --- diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c index bda52eaba..017376462 100644 --- a/src/lib/elm_panel.c +++ b/src/lib/elm_panel.c @@ -1700,6 +1700,9 @@ _elm_panel_scrollable_set(Eo *obj, Elm_Panel_Data *sd, Eina_Bool scrollable) elm_widget_resize_object_set(obj, NULL, EINA_TRUE); elm_widget_sub_object_add(obj, sd->panel_edje); + // TIZEN_ONLY(20171109): show and hide necessary object when scrollable is set + evas_object_hide(sd->panel_edje); + // if (!sd->scr_edje) { @@ -1719,6 +1722,9 @@ _elm_panel_scrollable_set(Eo *obj, Elm_Panel_Data *sd, Eina_Bool scrollable) } elm_widget_resize_object_set(obj, sd->scr_edje, EINA_TRUE); + // TIZEN_ONLY(20171109): show and hide necessary object when scrollable is set + evas_object_show(sd->scr_edje); + // if (!sd->hit_rect) { @@ -1755,6 +1761,9 @@ _elm_panel_scrollable_set(Eo *obj, Elm_Panel_Data *sd, Eina_Bool scrollable) eo_do(obj, elm_interface_scrollable_content_set(sd->scr_ly)); + // TIZEN_ONLY(20171109): show and hide necessary object when scrollable is set + evas_object_show(sd->scr_ly); + // sd->freeze = EINA_TRUE; elm_layout_content_set(sd->scr_ly, "elm.swallow.content", sd->bx); if (sd->content) elm_widget_sub_object_add(sd->scr_ly, sd->content); @@ -1808,10 +1817,19 @@ _elm_panel_scrollable_set(Eo *obj, Elm_Panel_Data *sd, Eina_Bool scrollable) elm_widget_resize_object_set(obj, NULL, EINA_TRUE); elm_widget_sub_object_add(obj, sd->scr_edje); + // TIZEN_ONLY(20171109): show and hide necessary object when scrollable is set + evas_object_hide(sd->scr_edje); + // elm_widget_resize_object_set(obj, sd->panel_edje, EINA_TRUE); + // TIZEN_ONLY(20171109): show and hide necessary object when scrollable is set + evas_object_show(sd->panel_edje); + // elm_layout_content_unset(sd->scr_ly, "elm.swallow.content"); + // TIZEN_ONLY(20171109): show and hide necessary object when scrollable is set + evas_object_hide(sd->scr_ly); + // elm_layout_content_set(obj, "elm.swallow.content", sd->bx); if (sd->content) elm_widget_sub_object_add(obj, sd->content); }