From 37625fca91c41d549ae8eca5b1609717599af5d4 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Thu, 9 Jun 2016 16:29:40 +0900 Subject: [PATCH] Evas/Edje/Elm: Use combined_min instead of min everywhere This allows apps to set the objects min size with hint_min, while letting the rest of EFL define the minimum size with rstricted_min. I don't like the property names much... --- src/bin/elementary/test_ui_box.c | 2 +- src/bin/elementary/test_ui_grid.c | 2 +- src/examples/evas/evas-hints.c | 2 +- src/lib/ecore_evas/ecore_evas_util.c | 2 +- src/lib/edje/edje_box_layout.c | 2 +- src/lib/edje/edje_lua.c | 2 +- src/lib/edje/edje_util.c | 2 +- src/lib/elementary/efl_ui_box.c | 2 +- src/lib/elementary/efl_ui_flip.c | 4 ++-- src/lib/elementary/efl_ui_grid.c | 2 +- src/lib/elementary/efl_ui_image.c | 6 +++--- src/lib/elementary/efl_ui_win.c | 6 +++--- src/lib/elementary/elc_ctxpopup.c | 2 +- src/lib/elementary/elc_hoversel.c | 2 +- src/lib/elementary/elc_multibuttonentry.c | 18 +++++++++--------- src/lib/elementary/elc_popup.c | 4 ++-- src/lib/elementary/elm_box.c | 2 +- src/lib/elementary/elm_colorselector.c | 4 ++-- src/lib/elementary/elm_diskselector.c | 2 +- src/lib/elementary/elm_entry.c | 8 ++++---- src/lib/elementary/elm_factory.c | 2 +- src/lib/elementary/elm_flipselector.c | 2 +- src/lib/elementary/elm_frame.c | 2 +- src/lib/elementary/elm_genlist.c | 4 ++-- src/lib/elementary/elm_hover.c | 2 +- src/lib/elementary/elm_label.c | 2 +- src/lib/elementary/elm_list.c | 6 +++--- src/lib/elementary/elm_map.c | 6 +++--- src/lib/elementary/elm_mapbuf.c | 2 +- src/lib/elementary/elm_scroller.c | 2 +- src/lib/elementary/elm_segment_control.c | 2 +- src/lib/elementary/elm_table.c | 2 +- src/lib/elementary/elm_toolbar.c | 4 ++-- src/lib/elementary/els_box.c | 8 ++++---- src/lib/elementary/els_tooltip.c | 2 +- src/lib/evas/canvas/evas_object_box.c | 16 ++++++++-------- src/lib/evas/canvas/evas_object_table.c | 6 +++--- 37 files changed, 73 insertions(+), 73 deletions(-) diff --git a/src/bin/elementary/test_ui_box.c b/src/bin/elementary/test_ui_box.c index 3ac8b474fc..51d10a3a22 100644 --- a/src/bin/elementary/test_ui_box.c +++ b/src/bin/elementary/test_ui_box.c @@ -174,7 +174,7 @@ _custom_engine_layout_do(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, EINA_ITERATOR_FOREACH(it, sobj) { int x, y, h, w, mw, mh; - evas_object_size_hint_min_get(sobj, &mw, &mh); + efl_gfx_size_hint_combined_min_get(sobj, &mw, &mh); x = (pw / count) * i; y = (ph / count) * i; w = mw; diff --git a/src/bin/elementary/test_ui_grid.c b/src/bin/elementary/test_ui_grid.c index ab5399db18..6e9cd46bb6 100644 --- a/src/bin/elementary/test_ui_grid.c +++ b/src/bin/elementary/test_ui_grid.c @@ -173,7 +173,7 @@ _custom_engine_layout_do(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, { int x, y, mw, mh; - evas_object_size_hint_min_get(item, &mw, &mh); + efl_gfx_size_hint_combined_min_get(item, &mw, &mh); x = gx + c * gw / cols + (cs * gw / cols - mw) / 2; y = gy + r * gh / rows + (rs * gh / rows - mh) / 2; efl_gfx_size_set(item, mw, mh); diff --git a/src/examples/evas/evas-hints.c b/src/examples/evas/evas-hints.c index 23c6f3d57e..8bc7455a6a 100644 --- a/src/examples/evas/evas-hints.c +++ b/src/examples/evas/evas-hints.c @@ -116,7 +116,7 @@ _print_rect_stats(Evas_Object *rect) evas_object_size_hint_align_get(rect, &x, &y); fprintf(stdout, "\talign hints: h(%f), v(%f)\n", x, y); - evas_object_size_hint_min_get(rect, &w, &h); + efl_gfx_size_hint_combined_min_get(rect, &w, &h); fprintf(stdout, "\tmin. size hints: h(%d), v(%d)\n", w, h); evas_object_size_hint_max_get(rect, &w, &h); diff --git a/src/lib/ecore_evas/ecore_evas_util.c b/src/lib/ecore_evas/ecore_evas_util.c index b027497405..1657c3043f 100644 --- a/src/lib/ecore_evas/ecore_evas_util.c +++ b/src/lib/ecore_evas/ecore_evas_util.c @@ -132,7 +132,7 @@ _ecore_evas_obj_callback_changed_size_hints(void *data, Evas *e EINA_UNUSED, Eva Ecore_Evas *ee = data; Evas_Coord w, h; - evas_object_size_hint_min_get(obj, &w, &h); + efl_gfx_size_hint_combined_min_get(obj, &w, &h); ecore_evas_size_min_set(ee, w, h); evas_object_size_hint_max_get(obj, &w, &h); diff --git a/src/lib/edje/edje_box_layout.c b/src/lib/edje/edje_box_layout.c index 2cffd6f991..bca4fb3c31 100644 --- a/src/lib/edje/edje_box_layout.c +++ b/src/lib/edje/edje_box_layout.c @@ -212,7 +212,7 @@ _edje_box_recalc_apply(Edje *ed EINA_UNUSED, Edje_Real_Part *ep, Edje_Calc_Param evas_object_smart_calculate(ep->object); } #if 0 /* Why the hell do we affect part size after resize ??? */ - evas_object_size_hint_min_get(ep->object, &min_w, &min_h); + efl_gfx_size_hint_combined_min_get(ep->object, &min_w, &min_h); if (chosen_desc->box.min.h && (p3->w < min_w)) p3->w = min_w; if (chosen_desc->box.min.v && (p3->h < min_h)) diff --git a/src/lib/edje/edje_lua.c b/src/lib/edje/edje_lua.c index 63021a2c2d..f5bef3326f 100644 --- a/src/lib/edje/edje_lua.c +++ b/src/lib/edje/edje_lua.c @@ -1424,7 +1424,7 @@ _edje_lua_object_get_size_hint_min(lua_State *L) { Edje_Lua_Evas_Object *obj = _edje_lua_checkudata(L, 1, &mObject); int w, h; - evas_object_size_hint_min_get(obj->eo, &w, &h); + efl_gfx_size_hint_combined_min_get(obj->eo, &w, &h); lua_createtable(L, 2, 0); lua_pushnumber(L, w); lua_rawseti(L, -2, 1); diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c index ad87ef7da4..40b4717261 100644 --- a/src/lib/edje/edje_util.c +++ b/src/lib/edje/edje_util.c @@ -6351,7 +6351,7 @@ _edje_real_part_swallow_hints_update(Edje_Real_Part *rp) Evas_Coord w1 = 0, h1 = 0, w2 = 0, h2 = 0, aw = 0, ah = 0; Evas_Aspect_Control am = EVAS_ASPECT_CONTROL_NONE; - evas_object_size_hint_min_get(rp->typedata.swallow->swallowed_object, &w1, &h1); + efl_gfx_size_hint_combined_min_get(rp->typedata.swallow->swallowed_object, &w1, &h1); evas_object_size_hint_max_get(rp->typedata.swallow->swallowed_object, &w2, &h2); evas_object_size_hint_aspect_get(rp->typedata.swallow->swallowed_object, &am, &aw, &ah); rp->typedata.swallow->swallow_params.min.w = w1; diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c index 341afa555a..eb14bffb1f 100644 --- a/src/lib/elementary/efl_ui_box.c +++ b/src/lib/elementary/efl_ui_box.c @@ -116,7 +116,7 @@ _sizing_eval(Evas_Object *obj, Efl_Ui_Box_Data *sd) if (sd->delete_me) return; - evas_object_size_hint_min_get(wd->resize_obj, &minw, &minh); + efl_gfx_size_hint_combined_min_get(wd->resize_obj, &minw, &minh); evas_object_size_hint_max_get(wd->resize_obj, &maxw, &maxh); evas_object_size_hint_min_set(obj, minw, minh); evas_object_size_hint_max_set(obj, maxw, maxh); diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c index 748397afc1..a6ac9b50c3 100644 --- a/src/lib/elementary/efl_ui_flip.c +++ b/src/lib/elementary/efl_ui_flip.c @@ -74,9 +74,9 @@ _sizing_eval(Evas_Object *obj) EFL_UI_FLIP_DATA_GET(obj, sd); if (sd->front.content) - evas_object_size_hint_min_get(sd->front.content, &minw, &minh); + efl_gfx_size_hint_combined_min_get(sd->front.content, &minw, &minh); if (sd->back.content) - evas_object_size_hint_min_get(sd->back.content, &minw2, &minh2); + efl_gfx_size_hint_combined_min_get(sd->back.content, &minw2, &minh2); if (sd->front.content) evas_object_size_hint_max_get(sd->front.content, &maxw, &maxh); if (sd->back.content) diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c index 05c847af93..66c8635455 100644 --- a/src/lib/elementary/efl_ui_grid.c +++ b/src/lib/elementary/efl_ui_grid.c @@ -193,7 +193,7 @@ _sizing_eval(Evas_Object *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); - evas_object_size_hint_min_get + efl_gfx_size_hint_combined_min_get (wd->resize_obj, &minw, &minh); evas_object_size_hint_max_get (wd->resize_obj, &maxw, &maxh); diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c index 3db96c9f5f..ebb974b09f 100644 --- a/src/lib/elementary/efl_ui_image.c +++ b/src/lib/elementary/efl_ui_image.c @@ -799,7 +799,7 @@ _efl_ui_image_sizing_eval(Eo *obj) efl_gfx_view_size_get(obj, &w, &h); sd->scale = ts; - evas_object_size_hint_min_get(obj, &minw, &minh); + efl_gfx_size_hint_combined_min_get(obj, &minw, &minh); if (sd->no_scale) { @@ -1077,7 +1077,7 @@ _efl_ui_image_edje_object_size_min_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *s if (sd->edje) edje_object_size_min_get(sd->img, w, h); else - evas_object_size_hint_min_get(sd->img, w, h); + efl_gfx_size_hint_combined_min_get(sd->img, w, h); } EOLIAN static void @@ -1102,7 +1102,7 @@ _efl_ui_image_edje_object_size_min_calc(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data * if (sd->edje) edje_object_size_min_calc(sd->img, w, h); else - evas_object_size_hint_min_get(sd->img, w, h); + efl_gfx_size_hint_combined_min_get(sd->img, w, h); } EOLIAN static void diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 4cd9c676af..ec77ab44e5 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -799,7 +799,7 @@ _elm_win_obj_callback_changed_size_hints(void *data, Evas *e EINA_UNUSED, Evas_O ELM_WIN_DATA_GET(data, sd); Evas_Coord w, h; - evas_object_size_hint_min_get(obj, &w, &h); + efl_gfx_size_hint_combined_min_get(obj, &w, &h); TRAP(sd, size_min_set, w, h); evas_object_size_hint_max_get(obj, &w, &h); @@ -2618,7 +2618,7 @@ _elm_win_resize_objects_eval(Evas_Object *obj) Evas_Coord w, h, minw, minh, maxw, maxh; double wx, wy; - evas_object_size_hint_min_get(sd->edje, &minw, &minh); + efl_gfx_size_hint_combined_min_get(sd->edje, &minw, &minh); if (minw < 1) minw = 1; if (minh < 1) minh = 1; @@ -3506,7 +3506,7 @@ _window_layout_stack(Evas_Object *o, Evas_Object_Box_Data *p, void *data) if (wx == 0.0) weight_x = 0; if (wy == 0.0) weight_y = 0; - evas_object_size_hint_min_get(child, &w, &h); + efl_gfx_size_hint_combined_min_get(child, &w, &h); if (w > minw) minw = w; if (h > minh) minh = h; } diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c index 7fb6779af9..a13557aa65 100644 --- a/src/lib/elementary/elc_ctxpopup.c +++ b/src/lib/elementary/elc_ctxpopup.c @@ -247,7 +247,7 @@ _base_geometry_calc(Evas_Object *obj, if ((max_size.x > 0) && (base_size.x > max_size.x)) base_size.x = max_size.x; //Limit to Min Size - evas_object_size_hint_min_get(obj, &min_size.x, &min_size.y); + efl_gfx_size_hint_combined_min_get(obj, &min_size.x, &min_size.y); if ((min_size.y > 0) && (base_size.y < min_size.y)) base_size.y = min_size.y; diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c index f8de7531a8..915b965ca2 100644 --- a/src/lib/elementary/elc_hoversel.c +++ b/src/lib/elementary/elc_hoversel.c @@ -241,7 +241,7 @@ _resizing_eval(Evas_Object *obj, Elm_Hoversel_Data *sd) if ((!sd->expanded) || (!sd->bx)) return; elm_box_recalculate(sd->bx); - evas_object_size_hint_min_get(sd->bx, &box_w, &box_h); + efl_gfx_size_hint_combined_min_get(sd->bx, &box_w, &box_h); max_size_str = elm_layout_data_get(sd->hover, "max_size"); if (max_size_str) diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c index df01d4fd8c..6679f7b8be 100644 --- a/src/lib/elementary/elc_multibuttonentry.c +++ b/src/lib/elementary/elc_multibuttonentry.c @@ -207,7 +207,7 @@ _shrink_mode_set(Evas_Object *obj, if (sd->label && sd->label_packed) { elm_box_pack_end(sd->box, sd->label); - evas_object_size_hint_min_get(sd->label, &w_tmp, NULL); + efl_gfx_size_hint_combined_min_get(sd->label, &w_tmp, NULL); w -= w_tmp; w -= box_inner_item_width_padding; } @@ -225,7 +225,7 @@ _shrink_mode_set(Evas_Object *obj, evas_object_show(VIEW(item)); item->visible = EINA_TRUE; - evas_object_size_hint_min_get(VIEW(item), &item_w, NULL); + efl_gfx_size_hint_combined_min_get(VIEW(item), &item_w, NULL); w -= item_w; w -= box_inner_item_width_padding; @@ -319,7 +319,7 @@ _view_update(Elm_Multibuttonentry_Data *sd) // update label if (sd->label) - evas_object_size_hint_min_get(sd->label, &width, &height); + efl_gfx_size_hint_combined_min_get(sd->label, &width, &height); if (sd->guide_text) { @@ -783,7 +783,7 @@ _item_new(Elm_Multibuttonentry_Data *sd, evas_object_show(VIEW(item)); evas_object_smart_calculate(VIEW(item)); - evas_object_size_hint_min_get(VIEW(item), &minw, &minh); + efl_gfx_size_hint_combined_min_get(VIEW(item), &minw, &minh); evas_object_geometry_get(sd->box, NULL, NULL, &boxw, NULL); if (sd->w_box && minw > boxw) @@ -1004,7 +1004,7 @@ _box_resize_cb(void *data, elm_layout_sizing_eval(VIEW(it)); evas_object_smart_calculate(VIEW(it)); - evas_object_size_hint_min_get(VIEW(it), &mnw, &mnh); + efl_gfx_size_hint_combined_min_get(VIEW(it), &mnw, &mnh); if (mnw > w - hpad) { @@ -1284,14 +1284,14 @@ _box_min_size_calculate(Evas_Object *box, Evas_Object_Box_Option *opt; evas_object_geometry_get(box, NULL, NULL, &w, NULL); - evas_object_size_hint_min_get(box, &minw, NULL); + efl_gfx_size_hint_combined_min_get(box, &minw, NULL); if (!w) return EINA_FALSE; line_num = 1; EINA_LIST_FOREACH(priv->children, l, opt) { - evas_object_size_hint_min_get(opt->obj, &mnw, &mnh); + efl_gfx_size_hint_combined_min_get(opt->obj, &mnw, &mnh); linew += mnw; if (lineh < mnh) lineh = mnh; @@ -1330,7 +1330,7 @@ _box_layout_cb(Evas_Object *o, evas_object_geometry_get(o, &x, &y, &w, &h); - evas_object_size_hint_min_get(o, &minw, &minh); + efl_gfx_size_hint_combined_min_get(o, &minw, &minh); evas_object_size_hint_align_get(o, &ax, &ay); rtl = elm_widget_mirrored_get(data); @@ -1360,7 +1360,7 @@ _box_layout_cb(Evas_Object *o, obj = opt->obj; evas_object_size_hint_align_get(obj, &ax, &ay); evas_object_size_hint_weight_get(obj, &wx, &wy); - evas_object_size_hint_min_get(obj, &mnw, &mnh); + efl_gfx_size_hint_combined_min_get(obj, &mnw, &mnh); fw = fh = EINA_FALSE; if (ax == -1.0) {fw = 1; ax = 0.5; } diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c index c2aa9d8b23..c119710283 100644 --- a/src/lib/elementary/elc_popup.c +++ b/src/lib/elementary/elc_popup.c @@ -459,14 +459,14 @@ _elm_popup_elm_layout_sizing_eval(Eo *obj, Elm_Popup_Data *sd) EINA_LIST_FOREACH(sd->items, elist, it) { _item_sizing_eval(it); - evas_object_size_hint_min_get(elm_layout_edje_get(VIEW(it)), + efl_gfx_size_hint_combined_min_get(elm_layout_edje_get(VIEW(it)), NULL, &minh_box); if (minh_box != -1) h_box += minh_box; } evas_object_size_hint_min_set(sd->spacer, 0, MIN(h_box, sd->max_sc_h)); evas_object_size_hint_max_set(sd->spacer, -1, sd->max_sc_h); - evas_object_size_hint_min_get(sd->scr, &minw, &minh); + efl_gfx_size_hint_combined_min_get(sd->scr, &minw, &minh); evas_object_size_hint_max_get(sd->scr, &minw, &minh); } else if (sd->scroll && (sd->content || sd->text_content_obj)) diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c index 962ebfb0c2..6dd73c17d7 100644 --- a/src/lib/elementary/elm_box.c +++ b/src/lib/elementary/elm_box.c @@ -135,7 +135,7 @@ _sizing_eval(Evas_Object *obj) if (sd->delete_me) return; - evas_object_size_hint_min_get + efl_gfx_size_hint_combined_min_get (wd->resize_obj, &minw, &minh); evas_object_size_hint_max_get diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index 05a96c6dde..3ec5277bd8 100644 --- a/src/lib/elementary/elm_colorselector.c +++ b/src/lib/elementary/elm_colorselector.c @@ -1451,7 +1451,7 @@ _picker_sizing_eval(Evas_Object *obj) ELM_COLORSELECTOR_DATA_GET(obj, sd); - evas_object_size_hint_min_get(sd->picker, &minw, &minh); + efl_gfx_size_hint_combined_min_get(sd->picker, &minw, &minh); evas_object_size_hint_min_set(obj, minw, minh); } @@ -1507,7 +1507,7 @@ _on_resize(void *data EINA_UNUSED, Evas *e EINA_UNUSED, { Evas_Coord w = 0, h = 0, minw = -1; - evas_object_size_hint_min_get(obj, &minw, NULL); + efl_gfx_size_hint_combined_min_get(obj, &minw, NULL); evas_object_geometry_get(obj, NULL, NULL, &w, &h); if ((w != sd->_w) && (w < minw)) elm_layout_sizing_eval(obj); diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c index 249a26e8a1..ed79eeb007 100644 --- a/src/lib/elementary/elm_diskselector.c +++ b/src/lib/elementary/elm_diskselector.c @@ -305,7 +305,7 @@ _resize_cb(void *data EINA_UNUSED, if (sd->items) { Elm_Diskselector_Item_Data *it = sd->items->data; - evas_object_size_hint_min_get(VIEW(it), &mw, &mh); + efl_gfx_size_hint_combined_min_get(VIEW(it), &mw, &mh); } if (sd->minh < mh) sd->minh = mh; edje_object_size_min_restricted_calc diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index 91963cc3e5..72687c4fe4 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -1012,7 +1012,7 @@ _deferred_recalc_job(void *data) { Evas_Coord ominw = -1; - evas_object_size_hint_min_get(data, &ominw, NULL); + efl_gfx_size_hint_combined_min_get(data, &ominw, NULL); minw = ominw; } @@ -1118,7 +1118,7 @@ _elm_entry_elm_layout_sizing_eval(Eo *obj, Elm_Entry_Data *sd) { Evas_Coord ominw = -1; - evas_object_size_hint_min_get(sd->entry_edje, &ominw, NULL); + efl_gfx_size_hint_combined_min_get(sd->entry_edje, &ominw, NULL); minw = ominw; } sd->ent_mw = minw; @@ -1351,7 +1351,7 @@ _hoversel_position(Evas_Object *obj) edje_object_part_text_cursor_geometry_get (sd->entry_edje, "elm.text", &cx, &cy, &cw, &ch); - evas_object_size_hint_min_get(sd->hoversel, &mw, &mh); + efl_gfx_size_hint_combined_min_get(sd->hoversel, &mw, &mh); if (cx + mw > w) cx = w - mw; if (cy + mh > h) @@ -2099,7 +2099,7 @@ _entry_changed_handle(void *data, /* Reset the size hints which are no more relevant. Keep the * height, this is a hack, but doesn't really matter cause we'll * re-eval in a moment. */ - evas_object_size_hint_min_get(data, NULL, &minh); + efl_gfx_size_hint_combined_min_get(data, NULL, &minh); evas_object_size_hint_min_set(data, -1, minh); elm_layout_sizing_eval(data); diff --git a/src/lib/elementary/elm_factory.c b/src/lib/elementary/elm_factory.c index 212f5121b0..d9bb11b3ad 100644 --- a/src/lib/elementary/elm_factory.c +++ b/src/lib/elementary/elm_factory.c @@ -87,7 +87,7 @@ _sizing_eval(Evas_Object *obj) if (!wd) return; if (!wd->content) return; - evas_object_size_hint_min_get(wd->content, &minw, &minh); + efl_gfx_size_hint_combined_min_get(wd->content, &minw, &minh); evas_object_size_hint_max_get(wd->content, &maxw, &maxh); if (wd->maxmin) { diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c index 569f4f9459..90d3caffcb 100644 --- a/src/lib/elementary/elm_flipselector.c +++ b/src/lib/elementary/elm_flipselector.c @@ -85,7 +85,7 @@ _elm_flipselector_elm_layout_sizing_eval(Eo *obj, Elm_Flipselector_Data *sd) edje_object_size_min_restricted_calc (wd->resize_obj, &minw, &minh, minw, minh); elm_coords_finger_size_adjust(1, &minw, 2, &minh); - evas_object_size_hint_min_get(obj, &w, &h); + efl_gfx_size_hint_combined_min_get(obj, &w, &h); if (sd->sentinel) { diff --git a/src/lib/elementary/elm_frame.c b/src/lib/elementary/elm_frame.c index 37c653896f..3d38ae90a1 100644 --- a/src/lib/elementary/elm_frame.c +++ b/src/lib/elementary/elm_frame.c @@ -45,7 +45,7 @@ _sizing_eval(Evas_Object *obj, Evas_Coord cminw = -1, cminh = -1; edje_object_size_min_calc(wd->resize_obj, &minw, &minh); - evas_object_size_hint_min_get(obj, &cminw, &cminh); + efl_gfx_size_hint_combined_min_get(obj, &cminw, &cminh); if ((minw == cminw) && (minh == cminh)) return; evas_object_size_hint_min_set(obj, minw, minh); diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index 85a7341d72..998f18f2bc 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -402,7 +402,7 @@ _item_content_realize(Elm_Gen_Item *it, if (eo_class_get(content) == ELM_LAYOUT_CLASS) { Evas_Coord old_w, old_h, minw = 0, minh = 0; - evas_object_size_hint_min_get(content, &old_w, &old_h); + efl_gfx_size_hint_combined_min_get(content, &old_w, &old_h); edje_object_size_min_calc(elm_layout_edje_get(content), &minw, &minh); if (old_w > minw) minw = old_w; @@ -868,7 +868,7 @@ _elm_genlist_elm_layout_sizing_eval(Eo *obj, Elm_Genlist_Data *sd) if (sd->on_sub_del) return;; - evas_object_size_hint_min_get(obj, &minw, NULL); + efl_gfx_size_hint_combined_min_get(obj, &minw, NULL); evas_object_size_hint_max_get(obj, &maxw, &maxh); edje_object_size_min_calc(wd->resize_obj, &vmw, &vmh); diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c index f8019da399..f5f43ee43d 100644 --- a/src/lib/elementary/elm_hover.c +++ b/src/lib/elementary/elm_hover.c @@ -168,7 +168,7 @@ _elm_hover_smart_content_location_get(Elm_Hover_Data *sd, Evas_Coord c_w = 0, c_h = 0, mid_w, mid_h; int max; - evas_object_size_hint_min_get(sd->smt_sub->obj, &c_w, &c_h); + efl_gfx_size_hint_combined_min_get(sd->smt_sub->obj, &c_w, &c_h); mid_w = c_w / 2; mid_h = c_h / 2; diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c index d052e433d3..ebbce9b657 100644 --- a/src/lib/elementary/elm_label.c +++ b/src/lib/elementary/elm_label.c @@ -59,7 +59,7 @@ _recalc(void *data) { Evas_Coord ominw = -1; - evas_object_size_hint_min_get(data, &ominw, NULL); + efl_gfx_size_hint_combined_min_get(data, &ominw, NULL); minw = ominw; } diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c index a11baae2dd..506ddded3c 100644 --- a/src/lib/elementary/elm_list.c +++ b/src/lib/elementary/elm_list.c @@ -687,7 +687,7 @@ _elm_list_elm_layout_sizing_eval(Eo *obj, Elm_List_Data *sd) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); - evas_object_size_hint_min_get(sd->box, &minw, &minh); + efl_gfx_size_hint_combined_min_get(sd->box, &minw, &minh); evas_object_size_hint_max_get(sd->box, &maxw, &maxh); evas_object_size_hint_weight_get(sd->box, &xw, &yw); @@ -844,13 +844,13 @@ _items_fix(Evas_Object *obj) if (it->deleted) continue; if (it->icon) { - evas_object_size_hint_min_get(it->icon, &mw, &mh); + efl_gfx_size_hint_combined_min_get(it->icon, &mw, &mh); if (mw > minw[0]) minw[0] = mw; if (mh > minh[0]) minh[0] = mh; } if (it->end) { - evas_object_size_hint_min_get(it->end, &mw, &mh); + efl_gfx_size_hint_combined_min_get(it->end, &mw, &mh); if (mw > minw[1]) minw[1] = mw; if (mh > minh[1]) minh[1] = mh; } diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c index 708154e58d..231cf45c3f 100644 --- a/src/lib/elementary/elm_map.c +++ b/src/lib/elementary/elm_map.c @@ -1474,7 +1474,7 @@ _icon_dup(Evas_Object *icon, evas_object_geometry_get(icon, NULL, NULL, &w, &h); if (w <= 0 || h <= 0) { - evas_object_size_hint_min_get(icon, &w, &h); + efl_gfx_size_hint_combined_min_get(icon, &w, &h); evas_object_size_hint_min_set(dupp, w, h); } else evas_object_resize(dupp, w, h); @@ -1525,7 +1525,7 @@ _overlay_default_show(Overlay_Default *ovl) { disp = ovl->content; evas_object_geometry_get(disp, NULL, NULL, &w, &h); - if (w <= 0 || h <= 0) evas_object_size_hint_min_get(disp, &w, &h); + if (w <= 0 || h <= 0) efl_gfx_size_hint_combined_min_get(disp, &w, &h); ovl->w = w; ovl->h = h; } @@ -1534,7 +1534,7 @@ _overlay_default_show(Overlay_Default *ovl) disp = ovl->clas_content; evas_object_geometry_get(disp, NULL, NULL, &w, &h); - if (w <= 0 || h <= 0) evas_object_size_hint_min_get(disp, &w, &h); + if (w <= 0 || h <= 0) efl_gfx_size_hint_combined_min_get(disp, &w, &h); } else { diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c index 004bdd3d05..4667cea6ef 100644 --- a/src/lib/elementary/elm_mapbuf.c +++ b/src/lib/elementary/elm_mapbuf.c @@ -28,7 +28,7 @@ _sizing_eval(Evas_Object *obj) ELM_MAPBUF_DATA_GET(obj, sd); if (sd->content) { - evas_object_size_hint_min_get(sd->content, &minw, &minh); + efl_gfx_size_hint_combined_min_get(sd->content, &minw, &minh); evas_object_size_hint_max_get(sd->content, &maxw, &maxh); } evas_object_size_hint_min_set(obj, minw, minh); diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c index 9e4d8e9582..661999a62b 100644 --- a/src/lib/elementary/elm_scroller.c +++ b/src/lib/elementary/elm_scroller.c @@ -319,7 +319,7 @@ _elm_scroller_elm_layout_sizing_eval(Eo *obj, Elm_Scroller_Data *sd) if (sd->content) { - evas_object_size_hint_min_get(sd->content, &minw, &minh); + efl_gfx_size_hint_combined_min_get(sd->content, &minw, &minh); evas_object_size_hint_max_get(sd->content, &maxw, &maxh); evas_object_size_hint_weight_get(sd->content, &xw, &yw); } diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c index d77b93227a..056882dda0 100644 --- a/src/lib/elementary/elm_segment_control.c +++ b/src/lib/elementary/elm_segment_control.c @@ -52,7 +52,7 @@ _elm_segment_control_elm_layout_sizing_eval(Eo *obj, Elm_Segment_Control_Data *s edje_object_size_min_restricted_calc (wd->resize_obj, &minw, &minh, minw, minh); - evas_object_size_hint_min_get(obj, &w, &h); + efl_gfx_size_hint_combined_min_get(obj, &w, &h); if (w > minw) minw = w; if (h > minh) minh = h; diff --git a/src/lib/elementary/elm_table.c b/src/lib/elementary/elm_table.c index 4eb5489192..6fe588ac9f 100644 --- a/src/lib/elementary/elm_table.c +++ b/src/lib/elementary/elm_table.c @@ -126,7 +126,7 @@ _sizing_eval(Evas_Object *obj) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); - evas_object_size_hint_min_get + efl_gfx_size_hint_combined_min_get (wd->resize_obj, &minw, &minh); evas_object_size_hint_max_get (wd->resize_obj, &maxw, &maxh); diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index 6dd3be8c5a..69a9a66a12 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -369,7 +369,7 @@ _resize_job(void *data) sd->resize_job = NULL; elm_interface_scrollable_content_viewport_geometry_get (obj, NULL, NULL, &vw, &vh); - evas_object_size_hint_min_get(sd->bx, &mw, &mh); + efl_gfx_size_hint_combined_min_get(sd->bx, &mw, &mh); w = sd->minw_bx; h = sd->minh_bx; @@ -1490,7 +1490,7 @@ _sizing_eval(Evas_Object *obj) evas_object_resize(wd->resize_obj, w, h); - evas_object_size_hint_min_get(sd->bx, &minw_bx, &minh_bx); + efl_gfx_size_hint_combined_min_get(sd->bx, &minw_bx, &minh_bx); elm_interface_scrollable_content_viewport_geometry_get (obj, NULL, NULL, &vw, &vh); diff --git a/src/lib/elementary/els_box.c b/src/lib/elementary/els_box.c index b874c79f33..05e88d2718 100644 --- a/src/lib/elementary/els_box.c +++ b/src/lib/elementary/els_box.c @@ -148,7 +148,7 @@ _smart_extents_non_homogeneous_calc(Evas_Object_Box_Data *priv, int w, int h, in rrw = &oh, rrh = &ow; evas_object_size_hint_padding_get(opt->obj, &pad_l, &pad_r, &pad_t, &pad_b); - evas_object_size_hint_min_get(opt->obj, &mnw, &mnh); + efl_gfx_size_hint_combined_min_get(opt->obj, &mnw, &mnh); mnw += pad_l + pad_r; mnh += pad_t + pad_b; if (*rminw < *rw) *rminw = *rw; @@ -253,7 +253,7 @@ _smart_extents_calculate(Evas_Object *box, Evas_Object_Box_Data *priv, int w, in if (ay < 0) fh = 1; evas_object_size_hint_padding_get(opt->obj, &pad_l, &pad_r, &pad_t, &pad_b); - evas_object_size_hint_min_get(opt->obj, &mnw, &mnh); + efl_gfx_size_hint_combined_min_get(opt->obj, &mnw, &mnh); mnw += pad_l + pad_r; mnh += pad_t + pad_b; if (minh < mnh) minh = mnh; @@ -370,7 +370,7 @@ _els_box_layout(Evas_Object *o, Evas_Object_Box_Data *priv, Eina_Bool horizontal _smart_extents_calculate(o, priv, w, h, expand, horizontal, homogeneous); evas_object_geometry_get(o, &x, &y, &w, &h); - evas_object_size_hint_min_get(o, &minw, &minh); + efl_gfx_size_hint_combined_min_get(o, &minw, &minh); evas_object_box_align_get(o, &ax, &ay); /* if object size is less than min, apply align to trigger viewporting */ if (w < minw) @@ -413,7 +413,7 @@ _els_box_layout(Evas_Object *o, Evas_Object_Box_Data *priv, Eina_Bool horizontal evas_object_size_hint_align_get(obj, &ax, &ay); evas_object_size_hint_weight_get(obj, &wx, &wy); evas_object_size_hint_padding_get(obj, &pad_l, &pad_r, &pad_t, &pad_b); - evas_object_size_hint_min_get(obj, &mnw, &mnh); + efl_gfx_size_hint_combined_min_get(obj, &mnw, &mnh); mnw += pad_l + pad_r; mnh += pad_t + pad_b; evas_object_size_hint_max_get(obj, &mxw, &mxh); diff --git a/src/lib/elementary/els_tooltip.c b/src/lib/elementary/els_tooltip.c index 6e3e5b9d49..ceb5d727ce 100644 --- a/src/lib/elementary/els_tooltip.c +++ b/src/lib/elementary/els_tooltip.c @@ -465,7 +465,7 @@ _elm_tooltip_reconfigure(Elm_Tooltip *tt) evas_object_layer_set(tt->tooltip, ELM_OBJECT_LAYER_TOOLTIP); } TTDBG("*******RECALC\n"); - evas_object_size_hint_min_get(tt->content, &ominw, &ominh); + efl_gfx_size_hint_combined_min_get(tt->content, &ominw, &ominh); edje_object_size_min_get(tt->tooltip, &eminw, &eminh); if (eminw && (ominw < eminw)) ominw = eminw; diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c index 10bd95f4a2..bed288ffc5 100644 --- a/src/lib/evas/canvas/evas_object_box.c +++ b/src/lib/evas/canvas/evas_object_box.c @@ -588,7 +588,7 @@ _sizing_eval(Evas_Object *obj) Evas_Coord minw, minh, maxw, maxh; Evas_Coord w, h; - evas_object_size_hint_min_get(obj, &minw, &minh); + efl_gfx_size_hint_combined_min_get(obj, &minw, &minh); evas_object_size_hint_max_get(obj, &maxw, &maxh); evas_object_geometry_get(obj, NULL, NULL, &w, &h); @@ -618,7 +618,7 @@ _evas_object_box_layout_horizontal_weight_apply(Evas_Object_Box_Data *priv, Evas { int min_w; - evas_object_size_hint_min_get(o, &min_w, NULL); + efl_gfx_size_hint_combined_min_get(o, &min_w, NULL); evas_object_resize(o, min_w, h); } else @@ -782,7 +782,7 @@ _evas_object_box_layout_vertical_weight_apply(Evas_Object_Box_Data *priv, Evas_O { int min_h; - evas_object_size_hint_min_get(o, NULL, &min_h); + efl_gfx_size_hint_combined_min_get(o, NULL, &min_h); evas_object_resize(o, w, min_h); } else @@ -962,7 +962,7 @@ _evas_box_layout_homogeneous_horizontal(Eo *o, Evas_Object_Box_Data *priv, Evas_ evas_object_size_hint_padding_get (opt->obj, &padding_l, &padding_r, &padding_t, &padding_b); evas_object_size_hint_max_get(opt->obj, &max_w, &max_h); - evas_object_size_hint_min_get(opt->obj, &min_w, NULL); + efl_gfx_size_hint_combined_min_get(opt->obj, &min_w, NULL); _sizing_eval(opt->obj); evas_object_geometry_get(opt->obj, NULL, NULL, &child_w, &child_h); @@ -1026,7 +1026,7 @@ _evas_box_layout_homogeneous_vertical(Eo *o, Evas_Object_Box_Data *priv, Evas_Ob evas_object_size_hint_padding_get (opt->obj, &padding_l, &padding_r, &padding_t, &padding_b); evas_object_size_hint_max_get(opt->obj, &max_w, &max_h); - evas_object_size_hint_min_get(opt->obj, NULL, &min_h); + efl_gfx_size_hint_combined_min_get(opt->obj, NULL, &min_h); _sizing_eval(opt->obj); evas_object_geometry_get(opt->obj, NULL, NULL, &child_w, &child_h); @@ -1112,7 +1112,7 @@ _evas_box_layout_homogeneous_max_size_horizontal(Eo *o, Evas_Object_Box_Data *pr evas_object_size_hint_padding_get (opt->obj, &padding_l, &padding_r, &padding_t, &padding_b); evas_object_size_hint_max_get(opt->obj, &max_w, &max_h); - evas_object_size_hint_min_get(opt->obj, &min_w, NULL); + efl_gfx_size_hint_combined_min_get(opt->obj, &min_w, NULL); evas_object_geometry_get(opt->obj, NULL, NULL, &child_w, &child_h); @@ -1199,7 +1199,7 @@ _evas_box_layout_homogeneous_max_size_vertical(Eo *o, Evas_Object_Box_Data *priv evas_object_size_hint_padding_get (opt->obj, &padding_l, &padding_r, &padding_t, &padding_b); evas_object_size_hint_max_get(opt->obj, &max_w, &max_h); - evas_object_size_hint_min_get(opt->obj, NULL, &min_h); + efl_gfx_size_hint_combined_min_get(opt->obj, NULL, &min_h); evas_object_geometry_get(opt->obj, NULL, NULL, &child_w, &child_h); @@ -1610,7 +1610,7 @@ _evas_box_layout_stack(Eo *o, Evas_Object_Box_Data *priv, Evas_Object_Box_Data * evas_object_size_hint_padding_get (child, &pad_l, &pad_r, &pad_t, &pad_b); evas_object_size_hint_max_get(child, &max_w, &max_h); - evas_object_size_hint_min_get(child, &min_w, &min_h); + efl_gfx_size_hint_combined_min_get(child, &min_w, &min_h); _sizing_eval(opt->obj); evas_object_geometry_get(child, NULL, NULL, &child_w, &child_h); diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c index 8f78f57368..0106098580 100644 --- a/src/lib/evas/canvas/evas_object_table.c +++ b/src/lib/evas/canvas/evas_object_table.c @@ -342,7 +342,7 @@ _evas_object_table_calculate_hints_homogeneous(Evas_Object *o, Evas_Table_Data * Evas_Coord child_minw, child_minh, cell_minw, cell_minh; double weightw, weighth; - evas_object_size_hint_min_get(child, &opt->min.w, &opt->min.h); + efl_gfx_size_hint_combined_min_get(child, &opt->min.w, &opt->min.h); evas_object_size_hint_max_get(child, &opt->max.w, &opt->max.h); evas_object_size_hint_padding_get (child, &opt->pad.l, &opt->pad.r, &opt->pad.t, &opt->pad.b); @@ -433,7 +433,7 @@ _evas_object_table_calculate_layout_homogeneous_sizes_item(const Evas_Object *o, Evas_Coord minw, minh; Eina_Bool expand_h, expand_v; - evas_object_size_hint_min_get(o, &minw, &minh); + efl_gfx_size_hint_combined_min_get(o, &minw, &minh); expand_h = priv->expand_h; expand_v = priv->expand_v; @@ -656,7 +656,7 @@ _evas_object_table_calculate_hints_regular(Evas_Object *o, Evas_Table_Data *priv Evas_Object *child = opt->obj; double weightw, weighth; - evas_object_size_hint_min_get(child, &opt->min.w, &opt->min.h); + efl_gfx_size_hint_combined_min_get(child, &opt->min.w, &opt->min.h); evas_object_size_hint_max_get(child, &opt->max.w, &opt->max.h); evas_object_size_hint_padding_get (child, &opt->pad.l, &opt->pad.r, &opt->pad.t, &opt->pad.b);