From: JinYong Park Date: Wed, 29 Nov 2017 09:52:06 +0000 (+0900) Subject: popup: fix popup's max height X-Git-Tag: submit/sandbox/upgrade/efl120/20180319.053334~636 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=60cdf2cca76976fe428af6ded3cf7abe158315e7;p=platform%2Fupstream%2Fefl.git popup: fix popup's max height If popup's parent is smaller than windown, popup's max height is smaller than which be intended @tizen_fix original patch : https://review.tizen.org/gerrit/#/c/112696/ Change-Id: I54cf7ce5b4ba856c6051067dc413f08114bd3c8e Signed-off-by: JinYong Park --- diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c index 78196ac..cb5e937 100644 --- a/src/lib/elementary/elc_popup.c +++ b/src/lib/elementary/elc_popup.c @@ -197,6 +197,9 @@ _scroller_size_calc(Evas_Object *obj) Evas_Coord h_title = 0; Evas_Coord h_action_area = 0; const char *action_area_height; + /* TIZEN_ONLY(20170202): fix popup max height */ + Evas_Coord y, wy; + /* END */ ELM_POPUP_DATA_GET(obj, sd); /* TIZEN_ONLY(20160623):Apply popup compress mode UX */ @@ -207,7 +210,16 @@ _scroller_size_calc(Evas_Object *obj) sd->scr_size_recalc = EINA_FALSE; sd->max_sc_h = -1; + /* TIZEN_ONLY(20170202): fix popup max height + adjust notify's height in case height of popup's parent is smaller than window's + and there is indicator below the popup evas_object_geometry_get(sd->notify, NULL, NULL, NULL, &h); + */ + evas_object_geometry_get(sd->notify, NULL, &y, NULL, &h); + + evas_object_geometry_get(elm_widget_top_get(sd->notify), NULL, &wy, NULL, NULL); + h += (y - wy); + /* END */ if (sd->title_text || sd->title_icon) edje_object_part_geometry_get(elm_layout_edje_get(sd->main_layout), "elm.bg.title", NULL, NULL, NULL, &h_title);