jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f773206769a101dfd19da537fcd5424e801ab0c1
commit f773206769a101dfd19da537fcd5424e801ab0c1 Author: Jean-Philippe Andre <jp.an...@samsung.com> Date: Thu Jun 9 14:31:37 2016 +0900 Efl: rename size hint content_min to restricted_min Still not sure about which keyword is the best to use here, but anyway, it's a protected function so users should realize it's probably not what they want. --- src/lib/edje/edje_calc.c | 6 +++--- src/lib/efl/interfaces/efl_gfx_size_hint.eo | 6 +++--- src/lib/evas/canvas/evas_object.eo | 4 ++-- src/lib/evas/canvas/evas_object_main.c | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c index 382e6d7..eab4f77 100644 --- a/src/lib/edje/edje_calc.c +++ b/src/lib/edje/edje_calc.c @@ -915,7 +915,7 @@ _edje_recalc_do(Edje *ed) ed->recalc_hints = EINA_FALSE; edje_obj_size_min_calc(ed->obj, &w, &h); - efl_gfx_size_hint_content_min_set(ed->obj, w, h); + efl_gfx_size_hint_restricted_min_set(ed->obj, w, h); } if (!ed->collection) return; @@ -2941,7 +2941,7 @@ _edje_part_recalc_single(Edje *ed, evas_obj_smart_need_recalculate_set(ep->object, 1); evas_obj_smart_calculate(ep->object); - efl_gfx_size_hint_content_min_get(ep->object, &lminw, &lminh); + efl_gfx_size_hint_restricted_min_get(ep->object, &lminw, &lminh); if (((Edje_Part_Description_Table *)chosen_desc)->table.min.h) { if (lminw > minw) minw = lminw; @@ -2959,7 +2959,7 @@ _edje_part_recalc_single(Edje *ed, evas_obj_smart_need_recalculate_set(ep->object, 1); evas_obj_smart_calculate(ep->object); - efl_gfx_size_hint_content_min_get(ep->object, &lminw, &lminh); + efl_gfx_size_hint_restricted_min_get(ep->object, &lminw, &lminh); if (((Edje_Part_Description_Box *)chosen_desc)->box.min.h) { if (lminw > minw) minw = lminw; diff --git a/src/lib/efl/interfaces/efl_gfx_size_hint.eo b/src/lib/efl/interfaces/efl_gfx_size_hint.eo index ce89906..0be8d96 100644 --- a/src/lib/efl/interfaces/efl_gfx_size_hint.eo +++ b/src/lib/efl/interfaces/efl_gfx_size_hint.eo @@ -102,7 +102,7 @@ interface Efl.Gfx.Size.Hint h: int; [[Integer to use as the preferred height hint.]] } } - @property hint_content_min @protected { + @property hint_restricted_min @protected { [[Internal hints for an object's minimum size. This is not a size enforcement in any way, it's just a hint @@ -122,10 +122,10 @@ interface Efl.Gfx.Size.Hint } } @property hint_combined_min { - [[Read-only minimum size combining both @.hint_content_min and + [[Read-only minimum size combining both @.hint_restricted_min and @.hint_request size hints. - @.hint_content_min is intended for mostly internal usage + @.hint_restricted_min is intended for mostly internal usage and widget developers, and @.hint_request is intended to be set from application side. @.hint_combined_min combines both values by taking their repective maximum (in both width and height), and diff --git a/src/lib/evas/canvas/evas_object.eo b/src/lib/evas/canvas/evas_object.eo index a4e342c..2acf42e 100644 --- a/src/lib/evas/canvas/evas_object.eo +++ b/src/lib/evas/canvas/evas_object.eo @@ -903,8 +903,8 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx, Efl.Gfx.Stack, Efl.Gfx.Size.Hint.hint_align.set; Efl.Gfx.Size.Hint.hint_align.get; Efl.Gfx.Size.Hint.hint_combined_min.get; - Efl.Gfx.Size.Hint.hint_content_min.set; - Efl.Gfx.Size.Hint.hint_content_min.get; + Efl.Gfx.Size.Hint.hint_restricted_min.set; + Efl.Gfx.Size.Hint.hint_restricted_min.get; Efl.Gfx.Size.Hint.hint_max.set; Efl.Gfx.Size.Hint.hint_max.get; Efl.Gfx.Size.Hint.hint_margin.set; diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c index 3bb785c..74073a8 100644 --- a/src/lib/evas/canvas/evas_object_main.c +++ b/src/lib/evas/canvas/evas_object_main.c @@ -1105,7 +1105,7 @@ _evas_object_size_hint_display_mode_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Prot } EOLIAN static void -_evas_object_efl_gfx_size_hint_hint_content_min_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *w, Evas_Coord *h) +_evas_object_efl_gfx_size_hint_hint_restricted_min_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *w, Evas_Coord *h) { if ((!obj->size_hints) || obj->delete_me) { @@ -1118,7 +1118,7 @@ _evas_object_efl_gfx_size_hint_hint_content_min_get(Eo *eo_obj EINA_UNUSED, Evas } EOLIAN static void -_evas_object_efl_gfx_size_hint_hint_content_min_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord w, Evas_Coord h) +_evas_object_efl_gfx_size_hint_hint_restricted_min_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord w, Evas_Coord h) { if (obj->delete_me) return; @@ -1740,7 +1740,7 @@ _evas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EI efl_gfx_position_get(eo_obj, &x, &y); efl_gfx_size_get(eo_obj, &w, &h); scale = evas_obj_scale_get(eo_obj); - efl_gfx_size_hint_content_min_get(eo_obj, &minw, &minh); + efl_gfx_size_hint_restricted_min_get(eo_obj, &minw, &minh); efl_gfx_size_hint_max_get(eo_obj, &maxw, &maxh); efl_gfx_size_hint_request_get(eo_obj, &requestw, &requesth); efl_gfx_size_hint_align_get(eo_obj, &dblx, &dbly); @@ -2186,13 +2186,13 @@ evas_object_size_hint_request_get(const Evas_Object *obj, Evas_Coord *w, Evas_Co EAPI void evas_object_size_hint_min_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) { - efl_gfx_size_hint_content_min_set(obj, w, h); + efl_gfx_size_hint_restricted_min_set(obj, w, h); } EAPI void evas_object_size_hint_min_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) { - efl_gfx_size_hint_content_min_get(obj, w, h); + efl_gfx_size_hint_restricted_min_get(obj, w, h); } EAPI void --