summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-02-21 18:19:45 +0100
committerXavi Artigas <xavierartigas@yahoo.es>2019-02-21 18:43:12 +0100
commitf886941b112573664598808ab0493e83126ea2bb (patch)
tree80e9b2f2114101f180207bac4c5c218b0425e10a /src/lib
parent94efabedf6475a665352ff30f4b869c5a310eb40 (diff)
api: efl.gfx.size_hints -> efl.gfx.hints
Summary: these hints are not strictly size-related, so renaming them is more consistent with their actual function ref T7563 Depends on D7968 Reviewers: segfaultxavi, cedric, bu5hm4n Subscribers: segfaultxavi, cedric, #reviewers, #committers Tags: #efl Maniphest Tasks: T7563 Differential Revision: https://phab.enlightenment.org/D7977
Diffstat (limited to '')
-rw-r--r--src/lib/edje/edje_calc.c8
-rw-r--r--src/lib/efl/Efl.h4
-rw-r--r--src/lib/efl/interfaces/efl_gfx_entity.eo2
-rw-r--r--src/lib/efl/interfaces/efl_gfx_hint.eo (renamed from src/lib/efl/interfaces/efl_gfx_size_hint.eo)40
-rw-r--r--src/lib/efl/interfaces/efl_gfx_types.eot4
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c2
-rw-r--r--src/lib/efl/interfaces/meson.build2
-rw-r--r--src/lib/elementary/efl_page_indicator_icon.c12
-rw-r--r--src/lib/elementary/efl_ui_box_layout.c28
-rw-r--r--src/lib/elementary/efl_ui_box_stack.c6
-rw-r--r--src/lib/elementary/efl_ui_grid.c20
-rw-r--r--src/lib/elementary/efl_ui_image.c2
-rw-r--r--src/lib/elementary/efl_ui_internal_text_scroller.c4
-rw-r--r--src/lib/elementary/efl_ui_list.c10
-rw-r--r--src/lib/elementary/efl_ui_list_view.c2
-rw-r--r--src/lib/elementary/efl_ui_list_view_precise_layouter.c18
-rw-r--r--src/lib/elementary/efl_ui_panes.c12
-rw-r--r--src/lib/elementary/efl_ui_panes_part.eo4
-rw-r--r--src/lib/elementary/efl_ui_popup.c2
-rw-r--r--src/lib/elementary/efl_ui_scroll_alert_popup.c6
-rw-r--r--src/lib/elementary/efl_ui_scroller.c10
-rw-r--r--src/lib/elementary/efl_ui_slider.c4
-rw-r--r--src/lib/elementary/efl_ui_tab_bar.c2
-rw-r--r--src/lib/elementary/efl_ui_tags.c42
-rw-r--r--src/lib/elementary/efl_ui_text.c6
-rw-r--r--src/lib/elementary/efl_ui_text_alert_popup.c6
-rw-r--r--src/lib/elementary/efl_ui_textpath.c6
-rw-r--r--src/lib/elementary/efl_ui_win.c48
-rw-r--r--src/lib/elementary/efl_ui_win.eo6
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c4
-rw-r--r--src/lib/elementary/elm_colorselector.c2
-rw-r--r--src/lib/evas/Evas_Common.h12
-rw-r--r--src/lib/evas/Evas_Internal.h2
-rw-r--r--src/lib/evas/Evas_Legacy.h20
-rw-r--r--src/lib/evas/canvas/efl_canvas_object.eo20
-rw-r--r--src/lib/evas/canvas/evas_object_main.c74
-rw-r--r--src/lib/evas/canvas/evas_object_table.c2
-rw-r--r--src/lib/evas/canvas/evas_render.c2
38 files changed, 228 insertions, 228 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index f09265f37b..1857990f42 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -1,4 +1,4 @@
1#define EFL_GFX_SIZE_HINT_PROTECTED 1#define EFL_GFX_HINT_PROTECTED
2 2
3#include "edje_private.h" 3#include "edje_private.h"
4 4
@@ -1004,7 +1004,7 @@ _edje_recalc_do(Edje *ed)
1004 ed->recalc_hints = EINA_FALSE; 1004 ed->recalc_hints = EINA_FALSE;
1005 1005
1006 edje_object_size_min_calc(ed->obj, &min.w, &min.h); 1006 edje_object_size_min_calc(ed->obj, &min.w, &min.h);
1007 efl_gfx_size_hint_restricted_min_set(ed->obj, min); 1007 efl_gfx_hint_size_restricted_min_set(ed->obj, min);
1008 } 1008 }
1009 1009
1010 if (!ed->collection) return; 1010 if (!ed->collection) return;
@@ -2906,7 +2906,7 @@ _edje_part_recalc_single(Edje *ed,
2906 2906
2907 efl_canvas_group_need_recalculate_set(ep->object, 1); 2907 efl_canvas_group_need_recalculate_set(ep->object, 1);
2908 efl_canvas_group_calculate(ep->object); 2908 efl_canvas_group_calculate(ep->object);
2909 lmin = efl_gfx_size_hint_restricted_min_get(ep->object); 2909 lmin = efl_gfx_hint_size_restricted_min_get(ep->object);
2910 if (((Edje_Part_Description_Table *)chosen_desc)->table.min.h) 2910 if (((Edje_Part_Description_Table *)chosen_desc)->table.min.h)
2911 { 2911 {
2912 if (lmin.w > minw) minw = lmin.w; 2912 if (lmin.w > minw) minw = lmin.w;
@@ -2924,7 +2924,7 @@ _edje_part_recalc_single(Edje *ed,
2924 2924
2925 efl_canvas_group_need_recalculate_set(ep->object, 1); 2925 efl_canvas_group_need_recalculate_set(ep->object, 1);
2926 efl_canvas_group_calculate(ep->object); 2926 efl_canvas_group_calculate(ep->object);
2927 lmin = efl_gfx_size_hint_restricted_min_get(ep->object); 2927 lmin = efl_gfx_hint_size_restricted_min_get(ep->object);
2928 if (((Edje_Part_Description_Box *)chosen_desc)->box.min.h) 2928 if (((Edje_Part_Description_Box *)chosen_desc)->box.min.h)
2929 { 2929 {
2930 if (lmin.w > minw) minw = lmin.w; 2930 if (lmin.w > minw) minw = lmin.w;
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 0ac67feea8..35772f8854 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -54,7 +54,7 @@ extern "C" {
54/* Add here all the required ifdef for any @protected method */ 54/* Add here all the required ifdef for any @protected method */
55#ifdef EFL_BUILD 55#ifdef EFL_BUILD
56# define EFL_PACK_LAYOUT_PROTECTED 56# define EFL_PACK_LAYOUT_PROTECTED
57# define EFL_GFX_SIZE_HINT_PROTECTED 57# define EFL_GFX_HINT_PROTECTED
58#endif 58#endif
59 59
60/** 60/**
@@ -134,7 +134,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
134#include "interfaces/efl_gfx_gradient_radial.eo.h" 134#include "interfaces/efl_gfx_gradient_radial.eo.h"
135#include "interfaces/efl_gfx_filter.eo.h" 135#include "interfaces/efl_gfx_filter.eo.h"
136#include "interfaces/efl_gfx_blur.eo.h" 136#include "interfaces/efl_gfx_blur.eo.h"
137#include "interfaces/efl_gfx_size_hint.eo.h" 137#include "interfaces/efl_gfx_hint.eo.h"
138#include "interfaces/efl_gfx_color_class.eo.h" 138#include "interfaces/efl_gfx_color_class.eo.h"
139#include "interfaces/efl_gfx_text_class.eo.h" 139#include "interfaces/efl_gfx_text_class.eo.h"
140#include "interfaces/efl_gfx_size_class.eo.h" 140#include "interfaces/efl_gfx_size_class.eo.h"
diff --git a/src/lib/efl/interfaces/efl_gfx_entity.eo b/src/lib/efl/interfaces/efl_gfx_entity.eo
index 5f40f6f17a..4c4eb21e98 100644
--- a/src/lib/efl/interfaces/efl_gfx_entity.eo
+++ b/src/lib/efl/interfaces/efl_gfx_entity.eo
@@ -31,7 +31,7 @@ interface @beta Efl.Gfx.Entity {
31 31
32 Note that setting the actual size of an object might be the job 32 Note that setting the actual size of an object might be the job
33 of its container, so this function might have no effect. 33 of its container, so this function might have no effect.
34 Look at @Efl.Gfx.Size_Hint instead, when manipulating 34 Look at @Efl.Gfx.Hint instead, when manipulating
35 widgets. 35 widgets.
36 ]] 36 ]]
37 } 37 }
diff --git a/src/lib/efl/interfaces/efl_gfx_size_hint.eo b/src/lib/efl/interfaces/efl_gfx_hint.eo
index af01fe08be..2cbcf87676 100644
--- a/src/lib/efl/interfaces/efl_gfx_size_hint.eo
+++ b/src/lib/efl/interfaces/efl_gfx_hint.eo
@@ -1,12 +1,12 @@
1import eina_types; 1import eina_types;
2import efl_gfx_types; 2import efl_gfx_types;
3 3
4const Efl.Gfx.Size_Hint_Expand: double = 1.0; 4const Efl.Gfx.Hint_Expand: double = 1.0;
5 [[Use with @Efl.Gfx.Size_Hint.hint_weight.]] 5 [[Use with @Efl.Gfx.Hint.hint_weight.]]
6 6
7interface @beta Efl.Gfx.Size_Hint 7interface @beta Efl.Gfx.Hint
8{ 8{
9 [[Efl graphics size hint interface]] 9 [[Efl graphics hint interface]]
10 event_prefix: efl_gfx_entity; 10 event_prefix: efl_gfx_entity;
11 methods { 11 methods {
12 @property hint_aspect { 12 @property hint_aspect {
@@ -27,7 +27,7 @@ interface @beta Efl.Gfx.Size_Hint
27 @image html aspect-control-horizontal.png 27 @image html aspect-control-horizontal.png
28 */ 28 */
29 values { 29 values {
30 mode: Efl.Gfx.Size_Hint_Aspect; [[Mode of interpretation.]] 30 mode: Efl.Gfx.Hint_Aspect; [[Mode of interpretation.]]
31 sz: Eina.Size2D; [[Base size to use for aspecting.]] 31 sz: Eina.Size2D; [[Base size to use for aspecting.]]
32 32
33 /* FIXME: do we want min/max like Edje instead?? 33 /* FIXME: do we want min/max like Edje instead??
@@ -36,7 +36,7 @@ interface @beta Efl.Gfx.Size_Hint
36 */ 36 */
37 } 37 }
38 } 38 }
39 @property hint_max { 39 @property hint_size_max {
40 [[Hints on the object's maximum size. 40 [[Hints on the object's maximum size.
41 41
42 This is not a size enforcement in any way, it's just a hint 42 This is not a size enforcement in any way, it's just a hint
@@ -49,7 +49,7 @@ interface @beta Efl.Gfx.Size_Hint
49 queried by managers. 49 queried by managers.
50 50
51 Note: Smart objects (such as elementary) can have their own 51 Note: Smart objects (such as elementary) can have their own
52 size hint policy. So calling this API may or may not affect 52 hint policy. So calling this API may or may not affect
53 the size of smart objects. 53 the size of smart objects.
54 ]] 54 ]]
55 values { 55 values {
@@ -57,7 +57,7 @@ interface @beta Efl.Gfx.Size_Hint
57 default for canvas objects).]] 57 default for canvas objects).]]
58 } 58 }
59 } 59 }
60 @property hint_min { 60 @property hint_size_min {
61 [[Hints on the object's minimum size. 61 [[Hints on the object's minimum size.
62 62
63 This is not a size enforcement in any way, it's just a hint 63 This is not a size enforcement in any way, it's just a hint
@@ -76,7 +76,7 @@ interface @beta Efl.Gfx.Size_Hint
76 sz: Eina.Size2D; [[Minimum size (hint) in pixels.]] 76 sz: Eina.Size2D; [[Minimum size (hint) in pixels.]]
77 } 77 }
78 } 78 }
79 @property hint_restricted_min { 79 @property hint_size_restricted_min {
80 [[Internal hints for an object's minimum size. 80 [[Internal hints for an object's minimum size.
81 81
82 This is not a size enforcement in any way, it's just a hint 82 This is not a size enforcement in any way, it's just a hint
@@ -88,7 +88,7 @@ interface @beta Efl.Gfx.Size_Hint
88 Note: This property is internal and meant for widget developers to 88 Note: This property is internal and meant for widget developers to
89 define the absolute minimum size of the object. EFL itself sets 89 define the absolute minimum size of the object. EFL itself sets
90 this size internally, so any change to it from an application 90 this size internally, so any change to it from an application
91 might be ignored. Use @.hint_min instead. 91 might be ignored. Use @.hint_size_min instead.
92 ]] 92 ]]
93 set @protected { 93 set @protected {
94 [[This function is protected as it is meant for widgets to indicate 94 [[This function is protected as it is meant for widgets to indicate
@@ -102,13 +102,13 @@ interface @beta Efl.Gfx.Size_Hint
102 sz: Eina.Size2D; [[Minimum size (hint) in pixels.]] 102 sz: Eina.Size2D; [[Minimum size (hint) in pixels.]]
103 } 103 }
104 } 104 }
105 @property hint_combined_min { 105 @property hint_size_combined_min {
106 [[Read-only minimum size combining both @.hint_restricted_min and 106 [[Read-only minimum size combining both @.hint_size_restricted_min and
107 @.hint_min size hints. 107 @.hint_size_min hints.
108 108
109 @.hint_restricted_min is intended for mostly internal usage 109 @.hint_size_restricted_min is intended for mostly internal usage
110 and widget developers, and @.hint_min is intended to be 110 and widget developers, and @.hint_size_min is intended to be
111 set from application side. @.hint_combined_min combines both values 111 set from application side. @.hint_size_combined_min combines both values
112 by taking their repective maximum (in both width and height), and 112 by taking their repective maximum (in both width and height), and
113 is used internally to get an object's minimum size. 113 is used internally to get an object's minimum size.
114 ]] 114 ]]
@@ -127,7 +127,7 @@ interface @beta Efl.Gfx.Size_Hint
127 placing the object accordingly. 127 placing the object accordingly.
128 128
129 Note: Smart objects (such as elementary) can have their own 129 Note: Smart objects (such as elementary) can have their own
130 size hint policy. So calling this API may or may not affect 130 hint policy. So calling this API may or may not affect
131 the size of smart objects. 131 the size of smart objects.
132 ]] 132 ]]
133 /* 133 /*
@@ -146,7 +146,7 @@ interface @beta Efl.Gfx.Size_Hint
146 This is a hint on how a container object should resize a given 146 This is a hint on how a container object should resize a given
147 child within its area. Containers may adhere to the simpler 147 child within its area. Containers may adhere to the simpler
148 logic of just expanding the child object's dimensions to fit 148 logic of just expanding the child object's dimensions to fit
149 its own (see the @Efl.Gfx.Size_Hint_Expand helper weight macro) or 149 its own (see the @Efl.Gfx.Hint_Expand helper weight macro) or
150 the complete one of taking each child's weight hint as real 150 the complete one of taking each child's weight hint as real
151 weights to how much of its size to allocate for them in each 151 weights to how much of its size to allocate for them in each
152 axis. A container is supposed to, after normalizing the 152 axis. A container is supposed to, after normalizing the
@@ -195,7 +195,7 @@ interface @beta Efl.Gfx.Size_Hint
195 or "fill" by some users. @.hint_fill specify whether to fill 195 or "fill" by some users. @.hint_fill specify whether to fill
196 the space inside the boundaries of a container/manager. 196 the space inside the boundaries of a container/manager.
197 197
198 Maximum size hints should be enforced with higher 198 Maximum hints should be enforced with higher
199 priority, if they are set. Also, any @.hint_margin set on 199 priority, if they are set. Also, any @.hint_margin set on
200 objects should add up to the object space on the final 200 objects should add up to the object space on the final
201 scene composition. 201 scene composition.
@@ -217,6 +217,6 @@ interface @beta Efl.Gfx.Size_Hint
217 } 217 }
218 } 218 }
219 events { 219 events {
220 change,size,hints: void; [[Object size hints changed.]] 220 change,size,hints: void; [[Object hints changed.]]
221 } 221 }
222} 222}
diff --git a/src/lib/efl/interfaces/efl_gfx_types.eot b/src/lib/efl/interfaces/efl_gfx_types.eot
index 9af1daf273..6f64ce30f0 100644
--- a/src/lib/efl/interfaces/efl_gfx_types.eot
+++ b/src/lib/efl/interfaces/efl_gfx_types.eot
@@ -169,11 +169,11 @@ struct Efl.Gfx.Event.Render_Post
169 updated in the canvas.]] 169 updated in the canvas.]]
170} 170}
171 171
172enum Efl.Gfx.Size_Hint_Aspect 172enum Efl.Gfx.Hint_Aspect
173{ 173{
174 [[Aspect types/policies for scaling size hints. 174 [[Aspect types/policies for scaling size hints.
175 175
176 See also @Efl.Gfx.Size_Hint.hint_aspect. 176 See also @Efl.Gfx.Hint.hint_aspect.
177 ]] 177 ]]
178 178
179 none = 0, [[No preference on either direction of the container 179 none = 0, [[No preference on either direction of the container
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index aee86025d6..6c2c495802 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -43,7 +43,7 @@
43#include "interfaces/efl_gfx_filter.eo.c" 43#include "interfaces/efl_gfx_filter.eo.c"
44#include "interfaces/efl_gfx_blur.eo.c" 44#include "interfaces/efl_gfx_blur.eo.c"
45 45
46#include "interfaces/efl_gfx_size_hint.eo.c" 46#include "interfaces/efl_gfx_hint.eo.c"
47#include "interfaces/efl_canvas_scene.eo.c" 47#include "interfaces/efl_canvas_scene.eo.c"
48#include "interfaces/efl_canvas_pointer.eo.c" 48#include "interfaces/efl_canvas_pointer.eo.c"
49 49
diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build
index 4c862196d2..adf9a1300b 100644
--- a/src/lib/efl/interfaces/meson.build
+++ b/src/lib/efl/interfaces/meson.build
@@ -72,7 +72,7 @@ pub_eo_files = [
72 'efl_gfx_gradient_radial.eo', 72 'efl_gfx_gradient_radial.eo',
73 'efl_gfx_filter.eo', 73 'efl_gfx_filter.eo',
74 'efl_gfx_blur.eo', 74 'efl_gfx_blur.eo',
75 'efl_gfx_size_hint.eo', 75 'efl_gfx_hint.eo',
76 'efl_model.eo', 76 'efl_model.eo',
77 'efl_animator.eo', 77 'efl_animator.eo',
78 'efl_interpolator.eo', 78 'efl_interpolator.eo',
diff --git a/src/lib/elementary/efl_page_indicator_icon.c b/src/lib/elementary/efl_page_indicator_icon.c
index 21a42f1654..3c9c54e75e 100644
--- a/src/lib/elementary/efl_page_indicator_icon.c
+++ b/src/lib/elementary/efl_page_indicator_icon.c
@@ -58,9 +58,9 @@ _efl_page_indicator_icon_pack(Eo *obj,
58 item = efl_add(EFL_CANVAS_LAYOUT_CLASS, spd->idbox); 58 item = efl_add(EFL_CANVAS_LAYOUT_CLASS, spd->idbox);
59 elm_widget_theme_object_set(spd->idbox, item, 59 elm_widget_theme_object_set(spd->idbox, item,
60 "pager", "indicator", "default"); 60 "pager", "indicator", "default");
61 efl_gfx_size_hint_align_set(item, 0.5, 0.5); 61 efl_gfx_hint_align_set(item, 0.5, 0.5);
62 efl_gfx_size_hint_weight_set(item, 0, 0); 62 efl_gfx_hint_weight_set(item, 0, 0);
63 efl_gfx_size_hint_fill_set(item, 0, 0); 63 efl_gfx_hint_fill_set(item, 0, 0);
64 64
65 if (index == spd->cnt) 65 if (index == spd->cnt)
66 { 66 {
@@ -145,9 +145,9 @@ _efl_page_indicator_icon_efl_page_indicator_bind(Eo *obj,
145 145
146 elm_widget_theme_object_set(spd->idbox, item, 146 elm_widget_theme_object_set(spd->idbox, item,
147 "pager", "indicator", "default"); 147 "pager", "indicator", "default");
148 efl_gfx_size_hint_align_set(item, 0.5, 0.5); 148 efl_gfx_hint_align_set(item, 0.5, 0.5);
149 efl_gfx_size_hint_weight_set(item, 0, 0); 149 efl_gfx_hint_weight_set(item, 0, 0);
150 efl_gfx_size_hint_fill_set(item, 0, 0); 150 efl_gfx_hint_fill_set(item, 0, 0);
151 efl_pack_end(spd->idbox, item); 151 efl_pack_end(spd->idbox, item);
152 } 152 }
153 153
diff --git a/src/lib/elementary/efl_ui_box_layout.c b/src/lib/elementary/efl_ui_box_layout.c
index 3b5f0a9c43..90c5d1b42f 100644
--- a/src/lib/elementary/efl_ui_box_layout.c
+++ b/src/lib/elementary/efl_ui_box_layout.c
@@ -1,4 +1,4 @@
1#define EFL_GFX_SIZE_HINT_PROTECTED 1#define EFL_GFX_HINT_PROTECTED
2 2
3#include "efl_ui_box_private.h" 3#include "efl_ui_box_private.h"
4 4
@@ -18,7 +18,7 @@ struct _Item_Calc
18 Eina_Bool fill[2]; 18 Eina_Bool fill[2];
19 Eina_Size2D max, min, aspect; 19 Eina_Size2D max, min, aspect;
20 int pad[4]; 20 int pad[4];
21 Efl_Gfx_Size_Hint_Aspect aspect_type; 21 Efl_Gfx_Hint_Aspect aspect_type;
22 int id; 22 int id;
23}; 23};
24 24
@@ -91,7 +91,7 @@ _efl_ui_box_custom_layout(Efl_Ui_Box *ui_box, Evas_Object_Box_Data *bd)
91 Eina_Bool box_fill[2] = { EINA_FALSE, EINA_FALSE }; 91 Eina_Bool box_fill[2] = { EINA_FALSE, EINA_FALSE };
92 92
93 boxs = efl_gfx_entity_geometry_get(ui_box); 93 boxs = efl_gfx_entity_geometry_get(ui_box);
94 efl_gfx_size_hint_margin_get(ui_box, &boxl, &boxr, &boxt, &boxb); 94 efl_gfx_hint_margin_get(ui_box, &boxl, &boxr, &boxt, &boxb);
95 scale = efl_gfx_entity_scale_get(ui_box); 95 scale = efl_gfx_entity_scale_get(ui_box);
96 96
97 // Box align: used if "item has max size and fill" or "no item has a weight" 97 // Box align: used if "item has max size and fill" or "no item has a weight"
@@ -112,7 +112,7 @@ _efl_ui_box_custom_layout(Efl_Ui_Box *ui_box, Evas_Object_Box_Data *bd)
112 count = eina_list_count(bd->children); 112 count = eina_list_count(bd->children);
113 if (!count) 113 if (!count)
114 { 114 {
115 efl_gfx_size_hint_min_set(ui_box, EINA_SIZE2D(0, 0)); 115 efl_gfx_hint_size_min_set(ui_box, EINA_SIZE2D(0, 0));
116 return; 116 return;
117 } 117 }
118 118
@@ -133,13 +133,13 @@ _efl_ui_box_custom_layout(Efl_Ui_Box *ui_box, Evas_Object_Box_Data *bd)
133 item = &items[id]; 133 item = &items[id];
134 o = item->obj = opt->obj; 134 o = item->obj = opt->obj;
135 135
136 efl_gfx_size_hint_weight_get(o, &item->weight[0], &item->weight[1]); 136 efl_gfx_hint_weight_get(o, &item->weight[0], &item->weight[1]);
137 efl_gfx_size_hint_align_get(o, &item->align[0], &item->align[1]); 137 efl_gfx_hint_align_get(o, &item->align[0], &item->align[1]);
138 efl_gfx_size_hint_margin_get(o, &item->pad[0], &item->pad[1], &item->pad[2], &item->pad[3]); 138 efl_gfx_hint_margin_get(o, &item->pad[0], &item->pad[1], &item->pad[2], &item->pad[3]);
139 efl_gfx_size_hint_fill_get(o, &item->fill[0], &item->fill[1]); 139 efl_gfx_hint_fill_get(o, &item->fill[0], &item->fill[1]);
140 item->max = efl_gfx_size_hint_max_get(o); 140 item->max = efl_gfx_hint_size_max_get(o);
141 item->min = efl_gfx_size_hint_combined_min_get(o); 141 item->min = efl_gfx_hint_size_combined_min_get(o);
142 efl_gfx_size_hint_aspect_get(o, &item->aspect_type, &item->aspect); 142 efl_gfx_hint_aspect_get(o, &item->aspect_type, &item->aspect);
143 143
144 if (horiz && (box_fill[0] || pd->homogeneous)) item->weight[0] = 1; 144 if (horiz && (box_fill[0] || pd->homogeneous)) item->weight[0] = 1;
145 else if (item->weight[0] < 0) item->weight[0] = 0; 145 else if (item->weight[0] < 0) item->weight[0] = 0;
@@ -176,7 +176,7 @@ _efl_ui_box_custom_layout(Efl_Ui_Box *ui_box, Evas_Object_Box_Data *bd)
176 { 176 {
177 ERR("Invalid aspect parameter for obj: %p", item->obj); 177 ERR("Invalid aspect parameter for obj: %p", item->obj);
178 item->aspect.w = item->aspect.h = 0; 178 item->aspect.w = item->aspect.h = 0;
179 item->aspect_type = EFL_GFX_SIZE_HINT_ASPECT_NONE; 179 item->aspect_type = EFL_GFX_HINT_ASPECT_NONE;
180 } 180 }
181 } 181 }
182 else 182 else
@@ -342,13 +342,13 @@ _efl_ui_box_custom_layout(Efl_Ui_Box *ui_box, Evas_Object_Box_Data *bd)
342 342
343 if (horiz) 343 if (horiz)
344 { 344 {
345 efl_gfx_size_hint_min_set(ui_box, EINA_SIZE2D( 345 efl_gfx_hint_size_min_set(ui_box, EINA_SIZE2D(
346 wantw + boxl + boxr + pad * (count - 1), 346 wantw + boxl + boxr + pad * (count - 1),
347 wanth + boxt + boxb)); 347 wanth + boxt + boxb));
348 } 348 }
349 else 349 else
350 { 350 {
351 efl_gfx_size_hint_min_set(ui_box, EINA_SIZE2D( 351 efl_gfx_hint_size_min_set(ui_box, EINA_SIZE2D(
352 wantw + boxl + boxr, 352 wantw + boxl + boxr,
353 wanth + pad * (count - 1) + boxt + boxb)); 353 wanth + pad * (count - 1) + boxt + boxb));
354 } 354 }
diff --git a/src/lib/elementary/efl_ui_box_stack.c b/src/lib/elementary/efl_ui_box_stack.c
index 38bc96cf55..ce356bd33a 100644
--- a/src/lib/elementary/efl_ui_box_stack.c
+++ b/src/lib/elementary/efl_ui_box_stack.c
@@ -1,4 +1,4 @@
1#define EFL_GFX_SIZE_HINT_PROTECTED 1#define EFL_GFX_HINT_PROTECTED
2 2
3#include "efl_ui_box_private.h" 3#include "efl_ui_box_private.h"
4 4
@@ -25,11 +25,11 @@ _efl_ui_box_stack_efl_pack_layout_layout_update(Eo *obj, void *_pd EINA_UNUSED)
25 { 25 {
26 Evas_Object *child = opt->obj; 26 Evas_Object *child = opt->obj;
27 27
28 cmin = efl_gfx_size_hint_combined_min_get(child); 28 cmin = efl_gfx_hint_size_combined_min_get(child);
29 if (cmin.w > min.w) min.w = cmin.w; 29 if (cmin.w > min.w) min.w = cmin.w;
30 if (cmin.h > min.h) min.h = cmin.h; 30 if (cmin.h > min.h) min.h = cmin.h;
31 } 31 }
32 efl_gfx_size_hint_restricted_min_set(obj, min); 32 efl_gfx_hint_size_restricted_min_set(obj, min);
33} 33}
34 34
35#include "efl_ui_box_stack.eo.c" 35#include "efl_ui_box_stack.eo.c"
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index c9ecd825b5..4fa6d5a2ce 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -117,8 +117,8 @@ _relayout(Eo *obj EINA_UNUSED, Efl_Ui_Grid_Data *pd, Eina_Position2D pan)
117 } 117 }
118 } 118 }
119 119
120 min = efl_gfx_size_hint_min_get(item); 120 min = efl_gfx_hint_size_min_get(item);
121 max = efl_gfx_size_hint_max_get(item); 121 max = efl_gfx_hint_size_max_get(item);
122 122
123 if (pd->item.size.w < min.w) pd->item.size.w = min.w; 123 if (pd->item.size.w < min.w) pd->item.size.w = min.w;
124 if (pd->item.size.h < min.h) pd->item.size.h = min.h; 124 if (pd->item.size.h < min.h) pd->item.size.h = min.h;
@@ -139,7 +139,7 @@ _relayout(Eo *obj EINA_UNUSED, Efl_Ui_Grid_Data *pd, Eina_Position2D pan)
139 // 139 //
140 efl_gfx_entity_position_set(item, ipos); 140 efl_gfx_entity_position_set(item, ipos);
141 efl_gfx_entity_size_set(item, id->geo.size); 141 efl_gfx_entity_size_set(item, id->geo.size);
142 //efl_gfx_size_hint_restricted_min_set(item, id->geo.size); 142 //efl_gfx_hint_size_restricted_min_set(item, id->geo.size);
143 143
144 prev = id; 144 prev = id;
145 count++; 145 count++;
@@ -150,7 +150,7 @@ _relayout(Eo *obj EINA_UNUSED, Efl_Ui_Grid_Data *pd, Eina_Position2D pan)
150 else 150 else
151 pd->geo.h = cur.y + pd->item.size.h + pd->item.pad.h - pd->geo.y; 151 pd->geo.h = cur.y + pd->item.size.h + pd->item.pad.h - pd->geo.y;
152 152
153 //efl_gfx_size_hint_restricted_min_set(pd->content, pd->geo.size); 153 //efl_gfx_hint_size_restricted_min_set(pd->content, pd->geo.size);
154 efl_gfx_entity_size_set(pd->content, pd->geo.size); 154 efl_gfx_entity_size_set(pd->content, pd->geo.size);
155 155
156 pd->need_update = EINA_FALSE; 156 pd->need_update = EINA_FALSE;
@@ -172,7 +172,7 @@ _reposition(Eo *obj EINA_UNUSED, Efl_Ui_Grid_Data *pd, Eina_Position2D pan)
172 ipos.y = id->geo.y - pan.y; 172 ipos.y = id->geo.y - pan.y;
173 efl_gfx_entity_position_set(item, ipos); 173 efl_gfx_entity_position_set(item, ipos);
174 efl_gfx_entity_size_set(item, id->geo.size); 174 efl_gfx_entity_size_set(item, id->geo.size);
175 //efl_gfx_size_hint_min_set(item, id->geo.size); 175 //efl_gfx_hint_size_min_set(item, id->geo.size);
176 } 176 }
177 177
178} 178}
@@ -708,9 +708,9 @@ _efl_ui_grid_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Grid_Data *pd)
708 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 708 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
709 709
710 710
711 min = efl_gfx_size_hint_combined_min_get(obj); 711 min = efl_gfx_hint_size_combined_min_get(obj);
712 max = efl_gfx_size_hint_max_get(obj); 712 max = efl_gfx_hint_size_max_get(obj);
713 efl_gfx_size_hint_weight_get(obj, &xw, &yw); 713 efl_gfx_hint_weight_get(obj, &xw, &yw);
714 714
715 if (pd->smanager) 715 if (pd->smanager)
716 view = efl_ui_scrollable_viewport_geometry_get(pd->smanager); 716 view = efl_ui_scrollable_viewport_geometry_get(pd->smanager);
@@ -740,11 +740,11 @@ _efl_ui_grid_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Grid_Data *pd)
740 if (pd->match_content_w) size.w = vmw + min.w; 740 if (pd->match_content_w) size.w = vmw + min.w;
741 if (pd->match_content_h) size.h = vmh + min.h; 741 if (pd->match_content_h) size.h = vmh + min.h;
742 742
743 max = efl_gfx_size_hint_max_get(obj); 743 max = efl_gfx_hint_size_max_get(obj);
744 if ((max.w > 0) && (size.w > max.w)) size.w = max.w; 744 if ((max.w > 0) && (size.w > max.w)) size.w = max.w;
745 if ((max.h > 0) && (size.h > max.h)) size.h = max.h; 745 if ((max.h > 0) && (size.h > max.h)) size.h = max.h;
746 pd->geo = view; 746 pd->geo = view;
747 efl_gfx_size_hint_min_set(obj, size); 747 efl_gfx_hint_size_min_set(obj, size);
748 748
749 _need_update(pd); 749 _need_update(pd);
750 return; 750 return;
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 0b6ecf5b89..a49e7c3141 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -1219,7 +1219,7 @@ _efl_ui_image_efl_layout_calc_calc_size_min(Eo *obj EINA_UNUSED, Efl_Ui_Image_Da
1219 else 1219 else
1220 { 1220 {
1221 // Ignore restricted here? Combine with min? Hmm... 1221 // Ignore restricted here? Combine with min? Hmm...
1222 return efl_gfx_size_hint_combined_min_get(sd->img); 1222 return efl_gfx_hint_size_combined_min_get(sd->img);
1223 } 1223 }
1224} 1224}
1225 1225
diff --git a/src/lib/elementary/efl_ui_internal_text_scroller.c b/src/lib/elementary/efl_ui_internal_text_scroller.c
index 237343a024..0773b976b5 100644
--- a/src/lib/elementary/efl_ui_internal_text_scroller.c
+++ b/src/lib/elementary/efl_ui_internal_text_scroller.c
@@ -118,8 +118,8 @@ _efl_ui_internal_text_scroller_elm_layout_sizing_eval(Eo *obj,
118 118
119 // FIXME: should be restricted_min? 119 // FIXME: should be restricted_min?
120 efl_gfx_entity_size_set(sd->text_table, fsz); 120 efl_gfx_entity_size_set(sd->text_table, fsz);
121 efl_gfx_size_hint_min_set(obj, size); 121 efl_gfx_hint_size_min_set(obj, size);
122 efl_gfx_size_hint_max_set(obj, EINA_SIZE2D(-1, size.h)); 122 efl_gfx_hint_size_max_set(obj, EINA_SIZE2D(-1, size.h));
123 } 123 }
124} 124}
125 125
diff --git a/src/lib/elementary/efl_ui_list.c b/src/lib/elementary/efl_ui_list.c
index e7d4bfced9..5511106c65 100644
--- a/src/lib/elementary/efl_ui_list.c
+++ b/src/lib/elementary/efl_ui_list.c
@@ -517,9 +517,9 @@ _efl_ui_list_elm_layout_sizing_eval(Eo *obj, Efl_Ui_List_Data *pd)
517 517
518 if (pd->box) 518 if (pd->box)
519 { 519 {
520 min = efl_gfx_size_hint_combined_min_get(pd->box); 520 min = efl_gfx_hint_size_combined_min_get(pd->box);
521 max = efl_gfx_size_hint_max_get(pd->box); 521 max = efl_gfx_hint_size_max_get(pd->box);
522 efl_gfx_size_hint_weight_get(pd->box, &xw, &yw); 522 efl_gfx_hint_weight_get(pd->box, &xw, &yw);
523 } 523 }
524 524
525 if (pd->smanager) 525 if (pd->smanager)
@@ -552,11 +552,11 @@ _efl_ui_list_elm_layout_sizing_eval(Eo *obj, Efl_Ui_List_Data *pd)
552 if (pd->match_content_w) size.w = vmw + min.w; 552 if (pd->match_content_w) size.w = vmw + min.w;
553 if (pd->match_content_h) size.h = vmh + min.h; 553 if (pd->match_content_h) size.h = vmh + min.h;
554 554
555 max = efl_gfx_size_hint_max_get(obj); 555 max = efl_gfx_hint_size_max_get(obj);
556 if ((max.w > 0) && (size.w > max.w)) size.w = max.w; 556 if ((max.w > 0) && (size.w > max.w)) size.w = max.w;
557 if ((max.h > 0) && (size.h > max.h)) size.h = max.h; 557 if ((max.h > 0) && (size.h > max.h)) size.h = max.h;
558 558
559 efl_gfx_size_hint_min_set(obj, size); 559 efl_gfx_hint_size_min_set(obj, size);
560} 560}
561 561
562//FIXME: is this box related API could be improved more? 562//FIXME: is this box related API could be improved more?
diff --git a/src/lib/elementary/efl_ui_list_view.c b/src/lib/elementary/efl_ui_list_view.c
index 7370fce15f..60a8c31e93 100644
--- a/src/lib/elementary/efl_ui_list_view.c
+++ b/src/lib/elementary/efl_ui_list_view.c
@@ -615,7 +615,7 @@ _efl_ui_list_view_efl_canvas_group_group_add(Eo *obj, Efl_Ui_List_View_Data *pd)
615 efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED); 615 efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED);
616 616
617 edje_object_size_min_calc(wd->resize_obj, &min.w, &min.h); 617 edje_object_size_min_calc(wd->resize_obj, &min.w, &min.h);
618 efl_gfx_size_hint_restricted_min_set(obj, min); 618 efl_gfx_hint_size_restricted_min_set(obj, min);
619 619
620 efl_event_callback_add(obj, EFL_UI_SCROLLBAR_EVENT_BAR_SIZE_CHANGED, 620 efl_event_callback_add(obj, EFL_UI_SCROLLBAR_EVENT_BAR_SIZE_CHANGED,
621 _efl_ui_list_view_bar_size_changed_cb, obj); 621 _efl_ui_list_view_bar_size_changed_cb, obj);
diff --git a/src/lib/elementary/efl_ui_list_view_precise_layouter.c b/src/lib/elementary/efl_ui_list_view_precise_layouter.c
index 488d4deeec..d20d706d3f 100644
--- a/src/lib/elementary/efl_ui_list_view_precise_layouter.c
+++ b/src/lib/elementary/efl_ui_list_view_precise_layouter.c
@@ -60,12 +60,12 @@ _item_size_calc(Efl_Ui_List_View_Precise_Layouter_Data *pd, Efl_Ui_List_View_Lay
60 Eina_Bool fill[2]; 60 Eina_Bool fill[2];
61 Eina_Size2D max; 61 Eina_Size2D max;
62 62
63 efl_gfx_size_hint_margin_get(item->layout, &pad[0], &pad[1], &pad[2], &pad[3]); 63 efl_gfx_hint_margin_get(item->layout, &pad[0], &pad[1], &pad[2], &pad[3]);
64 evas_object_geometry_get(pd->modeler, &boxx, &boxy, &boxw, &boxh); 64 evas_object_geometry_get(pd->modeler, &boxx, &boxy, &boxw, &boxh);
65 efl_gfx_size_hint_margin_get(pd->modeler, &boxl, &boxr, &boxt, &boxb); 65 efl_gfx_hint_margin_get(pd->modeler, &boxl, &boxr, &boxt, &boxb);
66 efl_gfx_size_hint_align_get(item->layout, &align[0], &align[1]); 66 efl_gfx_hint_align_get(item->layout, &align[0], &align[1]);
67 efl_gfx_size_hint_fill_get(item->layout, &fill[0], &fill[1]); 67 efl_gfx_hint_fill_get(item->layout, &fill[0], &fill[1]);
68 max = efl_gfx_size_hint_max_get(item->layout); 68 max = efl_gfx_hint_size_max_get(item->layout);
69 69
70 // box outer margin 70 // box outer margin
71 boxw -= boxl + boxr; 71 boxw -= boxl + boxr;
@@ -145,9 +145,9 @@ _item_min_calc(Efl_Ui_List_View_Precise_Layouter_Data *pd, Efl_Ui_List_View_Layo
145 Efl_Ui_List_View_Layout_Item *layout_item; 145 Efl_Ui_List_View_Layout_Item *layout_item;
146 int i, pad[4]; 146 int i, pad[4];
147 147
148 Eina_Size2D min = efl_gfx_size_hint_combined_min_get(item->layout); 148 Eina_Size2D min = efl_gfx_hint_size_combined_min_get(item->layout);
149 149
150 efl_gfx_size_hint_margin_get(item->layout, &pad[0], &pad[1], &pad[2], &pad[3]); 150 efl_gfx_hint_margin_get(item->layout, &pad[0], &pad[1], &pad[2], &pad[3]);
151 min.w += pad[0] + pad[1]; 151 min.w += pad[0] + pad[1];
152 min.h += pad[2] + pad[3]; 152 min.h += pad[2] + pad[3];
153 153
@@ -634,7 +634,7 @@ _efl_ui_list_view_relayout_layout_do(Efl_Ui_List_View_Precise_Layouter_Data *pd)
634 _calc_range(pd); 634 _calc_range(pd);
635 635
636 evas_object_geometry_get(pd->modeler, &boxx, &boxy, &boxw, &boxh); 636 evas_object_geometry_get(pd->modeler, &boxx, &boxy, &boxw, &boxh);
637 efl_gfx_size_hint_margin_get(pd->modeler, &boxl, &boxr, &boxt, &boxb); 637 efl_gfx_hint_margin_get(pd->modeler, &boxl, &boxr, &boxt, &boxb);
638 638
639 // box outer margin 639 // box outer margin
640 boxw -= boxl + boxr; 640 boxw -= boxl + boxr;
@@ -681,7 +681,7 @@ _efl_ui_list_view_relayout_layout_do(Efl_Ui_List_View_Precise_Layouter_Data *pd)
681 if (pd->resize) 681 if (pd->resize)
682 _item_size_calc(pd, layout_item); 682 _item_size_calc(pd, layout_item);
683 683
684 efl_gfx_size_hint_weight_get(layout_item->layout, &weight_x, &weight_y); 684 efl_gfx_hint_weight_get(layout_item->layout, &weight_x, &weight_y);
685 } 685 }
686 else 686 else
687 { 687 {
diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c
index 97dcd759b1..285a6eb22c 100644
--- a/src/lib/elementary/efl_ui_panes.c
+++ b/src/lib/elementary/efl_ui_panes.c
@@ -4,7 +4,7 @@
4 4
5#define EFL_ACCESS_OBJECT_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#define ELM_LAYOUT_PROTECTED 6#define ELM_LAYOUT_PROTECTED
7#define EFL_GFX_SIZE_HINT_PROTECTED 7#define EFL_GFX_HINT_PROTECTED
8#define EFL_PART_PROTECTED 8#define EFL_PART_PROTECTED
9 9
10#include <Elementary.h> 10#include <Elementary.h>
@@ -223,17 +223,17 @@ _efl_ui_panes_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Panes_Data *sd)
223 if (first_content) 223 if (first_content)
224 { 224 {
225 if (!sd->first_hint_min_allow) 225 if (!sd->first_hint_min_allow)
226 sd->first_min = efl_gfx_size_hint_combined_min_get(first_content); 226 sd->first_min = efl_gfx_hint_size_combined_min_get(first_content);
227 else 227 else
228 sd->first_min = efl_gfx_size_hint_min_get(first_content); 228 sd->first_min = efl_gfx_hint_size_min_get(first_content);
229 } 229 }
230 230
231 if (second_content) 231 if (second_content)
232 { 232 {
233 if (!sd->second_hint_min_allow) 233 if (!sd->second_hint_min_allow)
234 sd->second_min = efl_gfx_size_hint_combined_min_get(second_content); 234 sd->second_min = efl_gfx_hint_size_combined_min_get(second_content);
235 else 235 else
236 sd->second_min = efl_gfx_size_hint_min_get(second_content); 236 sd->second_min = efl_gfx_hint_size_min_get(second_content);
237 } 237 }
238 238
239 if (sd->dir == EFL_UI_DIR_HORIZONTAL) 239 if (sd->dir == EFL_UI_DIR_HORIZONTAL)
@@ -247,7 +247,7 @@ _efl_ui_panes_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Panes_Data *sd)
247 min.h = MAX(sd->first_min.h, sd->second_min.h); 247 min.h = MAX(sd->first_min.h, sd->second_min.h);
248 } 248 }
249 249
250 efl_gfx_size_hint_restricted_min_set(obj, min); 250 efl_gfx_hint_size_restricted_min_set(obj, min);
251 _set_min_size_new(obj); 251 _set_min_size_new(obj);
252} 252}
253 253
diff --git a/src/lib/elementary/efl_ui_panes_part.eo b/src/lib/elementary/efl_ui_panes_part.eo
index d7e6da12a4..2c12ac72f4 100644
--- a/src/lib/elementary/efl_ui_panes_part.eo
+++ b/src/lib/elementary/efl_ui_panes_part.eo
@@ -6,7 +6,7 @@ class @beta Efl.Ui.Panes_Part extends Efl.Ui.Layout_Part_Content
6 @property hint_min_allow { 6 @property hint_min_allow {
7 [[Allows the user to set size hints to be respected and ignored combined 7 [[Allows the user to set size hints to be respected and ignored combined
8 with a minimum size. If this flag is set, the minimum size set by 8 with a minimum size. If this flag is set, the minimum size set by
9 @Efl.Gfx.Size_Hint.hint_min.set is respected forcefully. 9 @Efl.Gfx.Hint.hint_size_min.set is respected forcefully.
10 ]] 10 ]]
11 values { 11 values {
12 allow: bool; [[If $true minimum size is forced]] 12 allow: bool; [[If $true minimum size is forced]]
@@ -15,7 +15,7 @@ class @beta Efl.Ui.Panes_Part extends Efl.Ui.Layout_Part_Content
15 @property split_ratio_min { 15 @property split_ratio_min {
16 [[Controls the relative minimum size of panes widget's part. 16 [[Controls the relative minimum size of panes widget's part.
17 17
18 If @Efl.Gfx.Size_Hint.hint_min.set is also used along with 18 If @Efl.Gfx.Hint.hint_size_min.set is also used along with
19 @.split_ratio_min.set, maximum value is set as minimum size to part. 19 @.split_ratio_min.set, maximum value is set as minimum size to part.
20 ]] 20 ]]
21 values { 21 values {
diff --git a/src/lib/elementary/efl_ui_popup.c b/src/lib/elementary/efl_ui_popup.c
index 6afdd55667..51fe9829bf 100644
--- a/src/lib/elementary/efl_ui_popup.c
+++ b/src/lib/elementary/efl_ui_popup.c
@@ -259,7 +259,7 @@ _sizing_eval(Eo *obj)
259 elm_coords_finger_size_adjust(1, &minw, 1, &minh); 259 elm_coords_finger_size_adjust(1, &minw, 1, &minh);
260 edje_object_size_min_restricted_calc 260 edje_object_size_min_restricted_calc
261 (wd->resize_obj, &minw, &minh, minw, minh); 261 (wd->resize_obj, &minw, &minh, minw, minh);
262 efl_gfx_size_hint_min_set(obj, EINA_SIZE2D(minw, minh)); 262 efl_gfx_hint_size_min_set(obj, EINA_SIZE2D(minw, minh));
263 263
264 Eina_Size2D size = efl_gfx_entity_size_get(obj); 264 Eina_Size2D size = efl_gfx_entity_size_get(obj);
265 265
diff --git a/src/lib/elementary/efl_ui_scroll_alert_popup.c b/src/lib/elementary/efl_ui_scroll_alert_popup.c
index d23e2919b3..1d4295e183 100644
--- a/src/lib/elementary/efl_ui_scroll_alert_popup.c
+++ b/src/lib/elementary/efl_ui_scroll_alert_popup.c
@@ -99,7 +99,7 @@ _scroller_sizing_eval(Eo *obj, Efl_Ui_Scroll_Alert_Popup_Data *pd,
99 efl_gfx_entity_size_set(obj, new_size); 99 efl_gfx_entity_size_set(obj, new_size);
100 } 100 }
101 101
102 efl_gfx_size_hint_min_set(obj, new_min); 102 efl_gfx_hint_size_min_set(obj, new_min);
103} 103}
104 104
105static void 105static void
@@ -159,8 +159,8 @@ _efl_ui_scroll_alert_popup_content_set(Eo *obj, Efl_Ui_Scroll_Alert_Popup_Data *
159 pd->content = content; 159 pd->content = content;
160 160
161 //Content should have expand propeties since the scroller is not layout layer 161 //Content should have expand propeties since the scroller is not layout layer
162 efl_gfx_size_hint_weight_set(pd->content, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 162 efl_gfx_hint_weight_set(pd->content, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
163 efl_gfx_size_hint_fill_set(pd->content, EINA_TRUE, EINA_TRUE); 163 efl_gfx_hint_fill_set(pd->content, EINA_TRUE, EINA_TRUE);
164 164
165 efl_content_set(pd->scroller, pd->content); 165 efl_content_set(pd->scroller, pd->content);
166 } 166 }
diff --git a/src/lib/elementary/efl_ui_scroller.c b/src/lib/elementary/efl_ui_scroller.c
index be2e773bc4..af9228c6c0 100644
--- a/src/lib/elementary/efl_ui_scroller.c
+++ b/src/lib/elementary/efl_ui_scroller.c
@@ -493,9 +493,9 @@ _efl_ui_scroller_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Scroller_Data *sd)
493 493
494 if (sd->content) 494 if (sd->content)
495 { 495 {
496 min = efl_gfx_size_hint_combined_min_get(sd->content); 496 min = efl_gfx_hint_size_combined_min_get(sd->content);
497 max = efl_gfx_size_hint_max_get(sd->content); 497 max = efl_gfx_hint_size_max_get(sd->content);
498 efl_gfx_size_hint_weight_get(sd->content, &xw, &yw); 498 efl_gfx_hint_weight_get(sd->content, &xw, &yw);
499 } 499 }
500 500
501 if (sd->smanager) 501 if (sd->smanager)
@@ -528,11 +528,11 @@ _efl_ui_scroller_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Scroller_Data *sd)
528 if (sd->match_content_w) size.w = vmw + min.w; 528 if (sd->match_content_w) size.w = vmw + min.w;
529 if (sd->match_content_h) size.h = vmh + min.h; 529 if (sd->match_content_h) size.h = vmh + min.h;
530 530
531 max = efl_gfx_size_hint_max_get(obj); 531 max = efl_gfx_hint_size_max_get(obj);
532 if ((max.w > 0) && (size.w > max.w)) size.w = max.w; 532 if ((max.w > 0) && (size.w > max.w)) size.w = max.w;
533 if ((max.h > 0) && (size.h > max.h)) size.h = max.h; 533 if ((max.h > 0) && (size.h > max.h)) size.h = max.h;
534 534
535 efl_gfx_size_hint_min_set(obj, size); 535 efl_gfx_hint_size_min_set(obj, size);
536} 536}
537 537
538EOLIAN static Efl_Ui_Theme_Apply_Result 538EOLIAN static Efl_Ui_Theme_Apply_Result
diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index ec51e9b336..e0953a18c5 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -472,8 +472,8 @@ _efl_ui_slider_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Slider_Data *_pd EINA_UNUS
472 elm_coords_finger_size_adjust(1, &minw, 1, &minh); 472 elm_coords_finger_size_adjust(1, &minw, 1, &minh);
473 edje_object_size_min_restricted_calc 473 edje_object_size_min_restricted_calc
474 (wd->resize_obj, &minw, &minh, minw, minh); 474 (wd->resize_obj, &minw, &minh, minw, minh);
475 efl_gfx_size_hint_restricted_min_set(obj, EINA_SIZE2D(minw, minh)); 475 efl_gfx_hint_size_restricted_min_set(obj, EINA_SIZE2D(minw, minh));
476 efl_gfx_size_hint_max_set(obj, EINA_SIZE2D(-1, -1)); 476 efl_gfx_hint_size_max_set(obj, EINA_SIZE2D(-1, -1));
477} 477}
478 478
479static void 479static void
diff --git a/src/lib/elementary/efl_ui_tab_bar.c b/src/lib/elementary/efl_ui_tab_bar.c
index f191f87e02..6f49b4026d 100644
--- a/src/lib/elementary/efl_ui_tab_bar.c
+++ b/src/lib/elementary/efl_ui_tab_bar.c
@@ -221,7 +221,7 @@ _tab_add(Eo *obj, const char *label, const char *icon)
221 ti->label = eina_stringshare_add(label); 221 ti->label = eina_stringshare_add(label);
222 222
223 tab = efl_add(EFL_UI_LAYOUT_CLASS, obj, 223 tab = efl_add(EFL_UI_LAYOUT_CLASS, obj,
224 efl_gfx_size_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL)); 224 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL));
225 /* FIXME: This is for tab sizing issue. 225 /* FIXME: This is for tab sizing issue.
226 * Recently, the size_hint_fill API has been added, 226 * Recently, the size_hint_fill API has been added,
227 * but currently tab_bar is not available because it uses evas_object_box. 227 * but currently tab_bar is not available because it uses evas_object_box.
diff --git a/src/lib/elementary/efl_ui_tags.c b/src/lib/elementary/efl_ui_tags.c
index 3cdaa70898..7185866a44 100644
--- a/src/lib/elementary/efl_ui_tags.c
+++ b/src/lib/elementary/efl_ui_tags.c
@@ -65,7 +65,7 @@ _shrink_mode_set(Eo *obj,
65 { 65 {
66 elm_box_pack_end(sd->box, sd->label); 66 elm_box_pack_end(sd->box, sd->label);
67 Eina_Size2D label_min = 67 Eina_Size2D label_min =
68 efl_gfx_size_hint_combined_min_get(sd->label); 68 efl_gfx_hint_size_combined_min_get(sd->label);
69 w -= label_min.w; 69 w -= label_min.w;
70 w -= box_inner_item_width_padding; 70 w -= box_inner_item_width_padding;
71 } 71 }
@@ -82,7 +82,7 @@ _shrink_mode_set(Eo *obj,
82 evas_object_show(layout); 82 evas_object_show(layout);
83 83
84 Eina_Size2D item_min = 84 Eina_Size2D item_min =
85 efl_gfx_size_hint_combined_min_get(layout); 85 efl_gfx_hint_size_combined_min_get(layout);
86 86
87 w -= item_min.w; 87 w -= item_min.w;
88 w -= box_inner_item_width_padding; 88 w -= box_inner_item_width_padding;
@@ -132,7 +132,7 @@ _shrink_mode_set(Eo *obj,
132 132
133 edje_object_size_min_calc(sd->end, &w_label_count, &h); 133 edje_object_size_min_calc(sd->end, &w_label_count, &h);
134 elm_coords_finger_size_adjust(1, &w_label_count, 1, &h); 134 elm_coords_finger_size_adjust(1, &w_label_count, 1, &h);
135 efl_gfx_size_hint_min_set(sd->end, EINA_SIZE2D(w_label_count, h)); 135 efl_gfx_hint_size_min_set(sd->end, EINA_SIZE2D(w_label_count, h));
136 elm_box_pack_end(sd->box, sd->end); 136 elm_box_pack_end(sd->box, sd->end);
137 evas_object_show(sd->end); 137 evas_object_show(sd->end);
138 138
@@ -426,19 +426,19 @@ _item_new(Efl_Ui_Tags_Data *sd,
426 (layout, 426 (layout,
427 EVAS_CALLBACK_MOUSE_UP, _mouse_up_cb, obj); 427 EVAS_CALLBACK_MOUSE_UP, _mouse_up_cb, obj);
428 428
429 efl_gfx_size_hint_align_set(layout, 0.5, 0.5); 429 efl_gfx_hint_align_set(layout, 0.5, 0.5);
430 efl_gfx_size_hint_weight_set(layout, 0.0, 0.0); 430 efl_gfx_hint_weight_set(layout, 0.0, 0.0);
431 431
432 evas_object_show(layout); 432 evas_object_show(layout);
433 433
434 evas_object_smart_calculate(layout); 434 evas_object_smart_calculate(layout);
435 min = efl_gfx_size_hint_combined_min_get(layout); 435 min = efl_gfx_hint_size_combined_min_get(layout);
436 r = efl_gfx_entity_geometry_get(sd->box); 436 r = efl_gfx_entity_geometry_get(sd->box);
437 437
438 if (sd->w_box && min.w > r.w) 438 if (sd->w_box && min.w > r.w)
439 { 439 {
440 elm_coords_finger_size_adjust(1, &r.w, 1, &min.h); 440 elm_coords_finger_size_adjust(1, &r.w, 1, &min.h);
441 efl_gfx_size_hint_min_set(layout, EINA_SIZE2D(r.w, min.h)); 441 efl_gfx_hint_size_min_set(layout, EINA_SIZE2D(r.w, min.h));
442 efl_gfx_entity_size_set(layout, EINA_SIZE2D(r.w, min.h)); 442 efl_gfx_entity_size_set(layout, EINA_SIZE2D(r.w, min.h));
443 } 443 }
444 444
@@ -488,8 +488,8 @@ _efl_ui_tags_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Tags_Data *sd EINA_UNUSED)
488 edje_object_size_min_restricted_calc 488 edje_object_size_min_restricted_calc
489 (wd->resize_obj, &minw, &minh, minw, minh); 489 (wd->resize_obj, &minw, &minh, minw, minh);
490 elm_coords_finger_size_adjust(1, &minw, 1, &minh); 490 elm_coords_finger_size_adjust(1, &minw, 1, &minh);
491 efl_gfx_size_hint_min_set(obj, EINA_SIZE2D(minw, minh)); 491 efl_gfx_hint_size_min_set(obj, EINA_SIZE2D(minw, minh));
492 efl_gfx_size_hint_max_set(obj, EINA_SIZE2D(maxw, maxh)); 492 efl_gfx_hint_size_max_set(obj, EINA_SIZE2D(maxw, maxh));
493} 493}
494 494
495static void 495static void
@@ -538,12 +538,12 @@ _box_resize_cb(void *data,
538 elm_layout_sizing_eval(layout); 538 elm_layout_sizing_eval(layout);
539 evas_object_smart_calculate(layout); 539 evas_object_smart_calculate(layout);
540 540
541 min = efl_gfx_size_hint_combined_min_get(layout); 541 min = efl_gfx_hint_size_combined_min_get(layout);
542 542
543 if (min.w > r.w - hpad) 543 if (min.w > r.w - hpad)
544 { 544 {
545 min.w = r.w - hpad; 545 min.w = r.w - hpad;
546 efl_gfx_size_hint_min_set(layout, EINA_SIZE2D(min.w, min.h)); 546 efl_gfx_hint_size_min_set(layout, EINA_SIZE2D(min.w, min.h));
547 efl_gfx_entity_size_set(layout, EINA_SIZE2D(min.w, min.h)); 547 efl_gfx_entity_size_set(layout, EINA_SIZE2D(min.w, min.h));
548 } 548 }
549 } 549 }
@@ -770,14 +770,14 @@ _box_min_size_calculate(Evas_Object *box,
770 Evas_Object_Box_Option *opt; 770 Evas_Object_Box_Option *opt;
771 771
772 evas_object_geometry_get(box, NULL, NULL, &w, NULL); 772 evas_object_geometry_get(box, NULL, NULL, &w, NULL);
773 box_min = efl_gfx_size_hint_combined_min_get(box); 773 box_min = efl_gfx_hint_size_combined_min_get(box);
774 774
775 if (!w) return EINA_FALSE; 775 if (!w) return EINA_FALSE;
776 776
777 line_num = 1; 777 line_num = 1;
778 EINA_LIST_FOREACH(priv->children, l, opt) 778 EINA_LIST_FOREACH(priv->children, l, opt)
779 { 779 {
780 min = efl_gfx_size_hint_combined_min_get(opt->obj); 780 min = efl_gfx_hint_size_combined_min_get(opt->obj);
781 781
782 linew += min.w; 782 linew += min.w;
783 if (lineh < min.h) lineh = min.h; 783 if (lineh < min.h) lineh = min.h;
@@ -793,7 +793,7 @@ _box_min_size_calculate(Evas_Object *box,
793 } 793 }
794 box_min.h = lineh * line_num + (line_num - 1) * priv->pad.v; 794 box_min.h = lineh * line_num + (line_num - 1) * priv->pad.v;
795 795
796 efl_gfx_size_hint_min_set(box, EINA_SIZE2D(box_min.w, box_min.h)); 796 efl_gfx_hint_size_min_set(box, EINA_SIZE2D(box_min.w, box_min.h));
797 *line_height = lineh; 797 *line_height = lineh;
798 798
799 return EINA_TRUE; 799 return EINA_TRUE;
@@ -818,8 +818,8 @@ _box_layout_cb(Evas_Object *o,
818 818
819 r = efl_gfx_entity_geometry_get(o); 819 r = efl_gfx_entity_geometry_get(o);
820 820
821 min = efl_gfx_size_hint_combined_min_get(o); 821 min = efl_gfx_hint_size_combined_min_get(o);
822 efl_gfx_size_hint_align_get(o, &ax, &ay); 822 efl_gfx_hint_align_get(o, &ax, &ay);
823 823
824 rtl = efl_ui_mirrored_get(data); 824 rtl = efl_ui_mirrored_get(data);
825 if (rtl) ax = 1.0 - ax; 825 if (rtl) ax = 1.0 - ax;
@@ -848,8 +848,8 @@ _box_layout_cb(Evas_Object *o,
848 obj = opt->obj; 848 obj = opt->obj;
849 evas_object_size_hint_align_get(obj, &ax, &ay); 849 evas_object_size_hint_align_get(obj, &ax, &ay);
850 evas_object_size_hint_weight_get(obj, &wx, &wy); 850 evas_object_size_hint_weight_get(obj, &wx, &wy);
851 efl_gfx_size_hint_fill_get(obj, &fx, &fy); 851 efl_gfx_hint_fill_get(obj, &fx, &fy);
852 obj_min = efl_gfx_size_hint_combined_min_get(obj); 852 obj_min = efl_gfx_hint_size_combined_min_get(obj);
853 853
854 if (EINA_DBL_EQ(ax, -1)) { fx = 1; ax = 0.5; } 854 if (EINA_DBL_EQ(ax, -1)) { fx = 1; ax = 0.5; }
855 else if (ax < 0) { ax = 0.0; } 855 else if (ax < 0) { ax = 0.0; }
@@ -940,10 +940,10 @@ _view_init(Evas_Object *obj, Efl_Ui_Tags_Data *sd)
940 efl_text_interactive_editable_set(efl_added, EINA_TRUE), 940 efl_text_interactive_editable_set(efl_added, EINA_TRUE),
941 efl_composite_attach(obj, efl_added)); 941 efl_composite_attach(obj, efl_added));
942 942
943 efl_gfx_size_hint_min_set(sd->entry, EINA_SIZE2D(MIN_W_ENTRY, 0)); 943 efl_gfx_hint_size_min_set(sd->entry, EINA_SIZE2D(MIN_W_ENTRY, 0));
944 evas_object_size_hint_weight_set 944 evas_object_size_hint_weight_set
945 (sd->entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 945 (sd->entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
946 efl_gfx_size_hint_fill_set(sd->entry, EINA_TRUE, EINA_TRUE); 946 efl_gfx_hint_fill_set(sd->entry, EINA_TRUE, EINA_TRUE);
947 947
948 elm_box_pack_end(sd->box, sd->entry); 948 elm_box_pack_end(sd->box, sd->entry);
949 949
@@ -958,7 +958,7 @@ _view_init(Evas_Object *obj, Efl_Ui_Tags_Data *sd)
958 958
959 edje_object_size_min_calc(sd->end, &button_min_width, &button_min_height); 959 edje_object_size_min_calc(sd->end, &button_min_width, &button_min_height);
960 elm_coords_finger_size_adjust(1, &button_min_width, 1, &button_min_height); 960 elm_coords_finger_size_adjust(1, &button_min_width, 1, &button_min_height);
961 efl_gfx_size_hint_min_set(sd->end, EINA_SIZE2D(button_min_width, button_min_height)); 961 efl_gfx_hint_size_min_set(sd->end, EINA_SIZE2D(button_min_width, button_min_height));
962 elm_widget_sub_object_add(obj, sd->end); 962 elm_widget_sub_object_add(obj, sd->end);
963 } 963 }
964} 964}
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 92b84f1b02..56118a5d81 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -889,7 +889,7 @@ _efl_ui_text_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Text_Data *sd)
889 } 889 }
890 890
891 elm_layout_sizing_eval(sd->scroller); 891 elm_layout_sizing_eval(sd->scroller);
892 min = efl_gfx_size_hint_min_get(sd->scroller); 892 min = efl_gfx_hint_size_min_get(sd->scroller);
893 if (sd->single_line) 893 if (sd->single_line)
894 { 894 {
895 efl_ui_internal_text_scroller_mode_set(sd->scroller, 895 efl_ui_internal_text_scroller_mode_set(sd->scroller,
@@ -897,7 +897,7 @@ _efl_ui_text_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Text_Data *sd)
897 edje_object_size_min_calc(wd->resize_obj, &edmin.w, &edmin.h); 897 edje_object_size_min_calc(wd->resize_obj, &edmin.w, &edmin.h);
898 min.w = edmin.w; 898 min.w = edmin.w;
899 min.h = edmin.h; 899 min.h = edmin.h;
900 efl_gfx_size_hint_restricted_min_set(obj, min); 900 efl_gfx_hint_size_restricted_min_set(obj, min);
901 } 901 }
902 902
903 sd->cursor_update = EINA_TRUE; 903 sd->cursor_update = EINA_TRUE;
@@ -909,7 +909,7 @@ _efl_ui_text_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Text_Data *sd)
909 efl_canvas_text_size_formatted_get(sd->text_obj, &min.w, &min.h); 909 efl_canvas_text_size_formatted_get(sd->text_obj, &min.w, &min.h);
910 min.w += edmin.w; 910 min.w += edmin.w;
911 min.h += edmin.h; 911 min.h += edmin.h;
912 efl_gfx_size_hint_restricted_min_set(obj, min); 912 efl_gfx_hint_size_restricted_min_set(obj, min);
913 } 913 }
914} 914}
915 915
diff --git a/src/lib/elementary/efl_ui_text_alert_popup.c b/src/lib/elementary/efl_ui_text_alert_popup.c
index 1f8c4601f5..e0d516a598 100644
--- a/src/lib/elementary/efl_ui_text_alert_popup.c
+++ b/src/lib/elementary/efl_ui_text_alert_popup.c
@@ -103,7 +103,7 @@ _scroller_sizing_eval(Eo *obj, Efl_Ui_Text_Alert_Popup_Data *pd, Eina_Size2D obj
103 efl_gfx_entity_size_set(obj, new_size); 103 efl_gfx_entity_size_set(obj, new_size);
104 } 104 }
105 105
106 efl_gfx_size_hint_min_set(obj, new_min); 106 efl_gfx_hint_size_min_set(obj, new_min);
107} 107}
108 108
109EOLIAN static void 109EOLIAN static void
@@ -127,7 +127,7 @@ _sizing_eval(Eo *obj, Efl_Ui_Text_Alert_Popup_Data *pd)
127 //Calculate popup's min size including scroller's min size 127 //Calculate popup's min size including scroller's min size
128 { 128 {
129 elm_label_line_wrap_set(pd->message, ELM_WRAP_NONE); 129 elm_label_line_wrap_set(pd->message, ELM_WRAP_NONE);
130 text_min = efl_gfx_size_hint_combined_min_get(pd->message); 130 text_min = efl_gfx_hint_size_combined_min_get(pd->message);
131 elm_label_line_wrap_set(pd->message, ELM_WRAP_MIXED); 131 elm_label_line_wrap_set(pd->message, ELM_WRAP_MIXED);
132 132
133 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_TRUE); 133 elm_scroller_content_min_limit(pd->scroller, EINA_FALSE, EINA_TRUE);
@@ -198,7 +198,7 @@ _efl_ui_text_alert_popup_text_set(Eo *obj, Efl_Ui_Text_Alert_Popup_Data *pd, con
198 // TODO: Change internal component to Efl.Ui.Widget 198 // TODO: Change internal component to Efl.Ui.Widget
199 pd->message = elm_label_add(obj); 199 pd->message = elm_label_add(obj);
200 //elm_widget_element_update(obj, pd->message, PART_NAME_TEXT); 200 //elm_widget_element_update(obj, pd->message, PART_NAME_TEXT);
201 efl_gfx_size_hint_weight_set(pd->message, EVAS_HINT_EXPAND, 201 efl_gfx_hint_weight_set(pd->message, EVAS_HINT_EXPAND,
202 EVAS_HINT_EXPAND); 202 EVAS_HINT_EXPAND);
203 efl_content_set(pd->scroller, pd->message); 203 efl_content_set(pd->scroller, pd->message);
204 } 204 }
diff --git a/src/lib/elementary/efl_ui_textpath.c b/src/lib/elementary/efl_ui_textpath.c
index 095c7a3891..8d4076ecdc 100644
--- a/src/lib/elementary/efl_ui_textpath.c
+++ b/src/lib/elementary/efl_ui_textpath.c
@@ -497,7 +497,7 @@ _path_data_get(Eo *obj, Efl_Ui_Textpath_Data *pd, Eina_Bool set_min)
497 } 497 }
498 if (set_min) 498 if (set_min)
499 { 499 {
500 efl_gfx_size_hint_min_set(obj, rect.size); 500 efl_gfx_hint_size_min_set(obj, rect.size);
501 } 501 }
502 } 502 }
503} 503}
@@ -581,8 +581,8 @@ _efl_ui_textpath_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Textpath_Data *priv)
581 priv->text_obj = edje_object_add(evas_object_evas_get(obj)); 581 priv->text_obj = edje_object_add(evas_object_evas_get(obj));
582 elm_widget_theme_object_set(obj, priv->text_obj, "textpath", "base", 582 elm_widget_theme_object_set(obj, priv->text_obj, "textpath", "base",
583 elm_widget_style_get(obj)); 583 elm_widget_style_get(obj));
584 efl_gfx_size_hint_weight_set(priv->text_obj, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 584 efl_gfx_hint_weight_set(priv->text_obj, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
585 efl_gfx_size_hint_align_set(priv->text_obj, EVAS_HINT_FILL, EVAS_HINT_FILL); 585 efl_gfx_hint_align_set(priv->text_obj, EVAS_HINT_FILL, EVAS_HINT_FILL);
586 efl_gfx_entity_visible_set(priv->text_obj, EINA_TRUE); 586 efl_gfx_entity_visible_set(priv->text_obj, EINA_TRUE);
587 587
588 evas_object_smart_member_add(priv->text_obj, obj); 588 evas_object_smart_member_add(priv->text_obj, obj);
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 91ee552a8f..edc05d71fe 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -6,7 +6,7 @@
6#define EFL_ACCESS_COMPONENT_PROTECTED 6#define EFL_ACCESS_COMPONENT_PROTECTED
7#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 7#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
8#define EFL_INPUT_EVENT_PROTECTED 8#define EFL_INPUT_EVENT_PROTECTED
9#define EFL_GFX_SIZE_HINT_PROTECTED 9#define EFL_GFX_HINT_PROTECTED
10#define EFL_CANVAS_OBJECT_PROTECTED 10#define EFL_CANVAS_OBJECT_PROTECTED
11#define EFL_UI_L10N_PROTECTED 11#define EFL_UI_L10N_PROTECTED
12#define EFL_UI_WIN_INLINED_PROTECTED 12#define EFL_UI_WIN_INLINED_PROTECTED
@@ -901,8 +901,8 @@ _elm_win_size_hints_update(Efl_Ui_Win *win, Efl_Ui_Win_Data *sd)
901{ 901{
902 Eina_Size2D min, max; 902 Eina_Size2D min, max;
903 903
904 min = efl_gfx_size_hint_combined_min_get(win); 904 min = efl_gfx_hint_size_combined_min_get(win);
905 max = efl_gfx_size_hint_max_get(win); 905 max = efl_gfx_hint_size_max_get(win);
906 if (max.w < 1) max.w = -1; 906 if (max.w < 1) max.w = -1;
907 if (max.h < 1) max.h = -1; 907 if (max.h < 1) max.h = -1;
908 908
@@ -1691,8 +1691,8 @@ _elm_win_state_change(Ecore_Evas *ee)
1691 } 1691 }
1692 if (ch_wm_rotation) 1692 if (ch_wm_rotation)
1693 { 1693 {
1694 efl_gfx_size_hint_restricted_min_set(obj, EINA_SIZE2D(-1, -1)); 1694 efl_gfx_hint_size_restricted_min_set(obj, EINA_SIZE2D(-1, -1));
1695 efl_gfx_size_hint_max_set(obj, EINA_SIZE2D(-1, -1)); 1695 efl_gfx_hint_size_max_set(obj, EINA_SIZE2D(-1, -1));
1696#ifdef HAVE_ELEMENTARY_X 1696#ifdef HAVE_ELEMENTARY_X
1697 ELM_WIN_DATA_ALIVE_CHECK(obj, sd); 1697 ELM_WIN_DATA_ALIVE_CHECK(obj, sd);
1698 _elm_win_xwin_update(sd); 1698 _elm_win_xwin_update(sd);
@@ -3574,7 +3574,7 @@ _elm_win_resize_objects_eval(Evas_Object *obj, Eina_Bool force_resize)
3574 if ((!minw) && (!minh) && (!sd->deferred_resize_job)) return; 3574 if ((!minw) && (!minh) && (!sd->deferred_resize_job)) return;
3575 3575
3576 // If content has a weight, make resizable 3576 // If content has a weight, make resizable
3577 efl_gfx_size_hint_weight_get(sd->legacy.edje, &wx, &wy); 3577 efl_gfx_hint_weight_get(sd->legacy.edje, &wx, &wy);
3578 3578
3579 // Content max hint is ignored 3579 // Content max hint is ignored
3580 maxw = sd->max_w; 3580 maxw = sd->max_w;
@@ -3612,8 +3612,8 @@ _elm_win_resize_objects_eval(Evas_Object *obj, Eina_Bool force_resize)
3612 } 3612 }
3613 3613
3614 sd->tmp_updating_hints = 1; 3614 sd->tmp_updating_hints = 1;
3615 efl_gfx_size_hint_restricted_min_set(obj, EINA_SIZE2D(minw, minh)); 3615 efl_gfx_hint_size_restricted_min_set(obj, EINA_SIZE2D(minw, minh));
3616 efl_gfx_size_hint_max_set(obj, EINA_SIZE2D(maxw, maxh)); 3616 efl_gfx_hint_size_max_set(obj, EINA_SIZE2D(maxw, maxh));
3617 sd->tmp_updating_hints = 0; 3617 sd->tmp_updating_hints = 0;
3618 _elm_win_size_hints_update(obj, sd); 3618 _elm_win_size_hints_update(obj, sd);
3619 3619
@@ -4880,7 +4880,7 @@ _indicator_resized(void *data, const Efl_Event *event)
4880 ELM_WIN_DATA_GET_OR_RETURN(data, sd); 4880 ELM_WIN_DATA_GET_OR_RETURN(data, sd);
4881 Evas_Object *indicator = event->object; 4881 Evas_Object *indicator = event->object;
4882 Evas_Coord_Size *size = (Evas_Coord_Size *)event->info; 4882 Evas_Coord_Size *size = (Evas_Coord_Size *)event->info;
4883 efl_gfx_size_hint_restricted_min_set(indicator, EINA_SIZE2D(size->w, size->h)); 4883 efl_gfx_hint_size_restricted_min_set(indicator, EINA_SIZE2D(size->w, size->h));
4884 _elm_win_frame_obj_update(sd, 0); 4884 _elm_win_frame_obj_update(sd, 0);
4885} 4885}
4886 4886
@@ -6458,12 +6458,12 @@ _win_aspect_get(Efl_Ui_Win_Data *sd)
6458} 6458}
6459 6459
6460EOLIAN static void 6460EOLIAN static void
6461_efl_ui_win_efl_gfx_size_hint_hint_aspect_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd, 6461_efl_ui_win_efl_gfx_hint_hint_aspect_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd,
6462 Efl_Gfx_Size_Hint_Aspect mode, Eina_Size2D sz) 6462 Efl_Gfx_Hint_Aspect mode, Eina_Size2D sz)
6463{ 6463{
6464 if (sz.h) _win_aspect_set(pd, (double) sz.w / (double) sz.h); 6464 if (sz.h) _win_aspect_set(pd, (double) sz.w / (double) sz.h);
6465 else _win_aspect_set(pd, 0.0); 6465 else _win_aspect_set(pd, 0.0);
6466 efl_gfx_size_hint_aspect_set(efl_super(obj, MY_CLASS), mode, sz); 6466 efl_gfx_hint_aspect_set(efl_super(obj, MY_CLASS), mode, sz);
6467#ifdef HAVE_ELEMENTARY_WL2 6467#ifdef HAVE_ELEMENTARY_WL2
6468 if (pd->wl.win) 6468 if (pd->wl.win)
6469 ecore_wl2_window_aspect_set(pd->wl.win, sz.w, sz.h, mode); 6469 ecore_wl2_window_aspect_set(pd->wl.win, sz.w, sz.h, mode);
@@ -6471,10 +6471,10 @@ _efl_ui_win_efl_gfx_size_hint_hint_aspect_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Da
6471} 6471}
6472 6472
6473EOLIAN static void 6473EOLIAN static void
6474_efl_ui_win_efl_gfx_size_hint_hint_weight_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd EINA_UNUSED, 6474_efl_ui_win_efl_gfx_hint_hint_weight_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd EINA_UNUSED,
6475 double w, double h) 6475 double w, double h)
6476{ 6476{
6477 efl_gfx_size_hint_weight_set(efl_super(obj, MY_CLASS), w, h); 6477 efl_gfx_hint_weight_set(efl_super(obj, MY_CLASS), w, h);
6478#ifdef HAVE_ELEMENTARY_WL2 6478#ifdef HAVE_ELEMENTARY_WL2
6479 if (pd->wl.win) 6479 if (pd->wl.win)
6480 ecore_wl2_window_weight_set(pd->wl.win, w, h); 6480 ecore_wl2_window_weight_set(pd->wl.win, w, h);
@@ -6510,11 +6510,11 @@ _efl_ui_win_hint_step_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Size2D
6510} 6510}
6511 6511
6512EOLIAN static void 6512EOLIAN static void
6513_efl_ui_win_efl_gfx_size_hint_hint_max_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Size2D sz) 6513_efl_ui_win_efl_gfx_hint_hint_size_max_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Size2D sz)
6514{ 6514{
6515 if (sd->tmp_updating_hints) 6515 if (sd->tmp_updating_hints)
6516 { 6516 {
6517 efl_gfx_size_hint_max_set(efl_super(obj, MY_CLASS), sz); 6517 efl_gfx_hint_size_max_set(efl_super(obj, MY_CLASS), sz);
6518 } 6518 }
6519 else 6519 else
6520 { 6520 {
@@ -6595,8 +6595,8 @@ _win_rotate(Evas_Object *obj, Efl_Ui_Win_Data *sd, int rotation, Eina_Bool resiz
6595 sd->rot = rotation; 6595 sd->rot = rotation;
6596 if (resize) TRAP(sd, rotation_with_resize_set, rotation); 6596 if (resize) TRAP(sd, rotation_with_resize_set, rotation);
6597 else TRAP(sd, rotation_set, rotation); 6597 else TRAP(sd, rotation_set, rotation);
6598 efl_gfx_size_hint_restricted_min_set(obj, EINA_SIZE2D(-1, -1)); 6598 efl_gfx_hint_size_restricted_min_set(obj, EINA_SIZE2D(-1, -1));
6599 efl_gfx_size_hint_max_set(obj, EINA_SIZE2D(-1, -1)); 6599 efl_gfx_hint_size_max_set(obj, EINA_SIZE2D(-1, -1));
6600 _elm_win_resize_objects_eval(obj, EINA_FALSE); 6600 _elm_win_resize_objects_eval(obj, EINA_FALSE);
6601#ifdef HAVE_ELEMENTARY_X 6601#ifdef HAVE_ELEMENTARY_X
6602 _elm_win_xwin_update(sd); 6602 _elm_win_xwin_update(sd);
@@ -7442,8 +7442,8 @@ _elm_win_bg_set(Efl_Ui_Win_Data *sd, Eo *bg)
7442 } 7442 }
7443 } 7443 }
7444 efl_gfx_entity_visible_set(bg, 1); 7444 efl_gfx_entity_visible_set(bg, 1);
7445 efl_gfx_size_hint_fill_set(bg, EINA_TRUE, EINA_TRUE); 7445 efl_gfx_hint_fill_set(bg, EINA_TRUE, EINA_TRUE);
7446 efl_gfx_size_hint_weight_set(bg, 1, 1); 7446 efl_gfx_hint_weight_set(bg, 1, 1);
7447 efl_wref_add(bg, &sd->bg); 7447 efl_wref_add(bg, &sd->bg);
7448 return EINA_TRUE; 7448 return EINA_TRUE;
7449} 7449}
@@ -8661,7 +8661,7 @@ elm_win_aspect_set(Eo *obj, double aspect)
8661 if (aspect > DBL_EPSILON) 8661 if (aspect > DBL_EPSILON)
8662 sz = EINA_SIZE2D(1000 * aspect, 1000); 8662 sz = EINA_SIZE2D(1000 * aspect, 1000);
8663 8663
8664 efl_gfx_size_hint_aspect_set(obj, EFL_GFX_SIZE_HINT_ASPECT_NONE, sz); 8664 efl_gfx_hint_aspect_set(obj, EFL_GFX_HINT_ASPECT_NONE, sz);
8665} 8665}
8666 8666
8667EAPI double 8667EAPI double
@@ -8714,7 +8714,7 @@ _window_layout_stack(Evas_Object *o, Evas_Object_Box_Data *p, void *data)
8714 EINA_LIST_FOREACH(p->children, l, opt) 8714 EINA_LIST_FOREACH(p->children, l, opt)
8715 { 8715 {
8716 child = opt->obj; 8716 child = opt->obj;
8717 efl_gfx_size_hint_weight_get(child, &wx, &wy); 8717 efl_gfx_hint_weight_get(child, &wx, &wy);
8718 if (EINA_DBL_EQ(wx, 0.0)) weight_x = 0; 8718 if (EINA_DBL_EQ(wx, 0.0)) weight_x = 0;
8719 if (EINA_DBL_EQ(wy, 0.0)) weight_y = 0; 8719 if (EINA_DBL_EQ(wy, 0.0)) weight_y = 0;
8720 8720
@@ -8724,7 +8724,7 @@ _window_layout_stack(Evas_Object *o, Evas_Object_Box_Data *p, void *data)
8724 } 8724 }
8725 8725
8726 if (minw < menuw) minw = menuw; 8726 if (minw < menuw) minw = menuw;
8727 efl_gfx_size_hint_restricted_min_set(o, EINA_SIZE2D(minw, minh)); 8727 efl_gfx_hint_size_restricted_min_set(o, EINA_SIZE2D(minw, minh));
8728 evas_object_geometry_get(o, &x, &y, &w, &h); 8728 evas_object_geometry_get(o, &x, &y, &w, &h);
8729 if (w < minw) w = minw; 8729 if (w < minw) w = minw;
8730 if (h < minh) h = minh; 8730 if (h < minh) h = minh;
@@ -8736,7 +8736,7 @@ _window_layout_stack(Evas_Object *o, Evas_Object_Box_Data *p, void *data)
8736 evas_object_geometry_set(child, x, y, w, h); 8736 evas_object_geometry_set(child, x, y, w, h);
8737 } 8737 }
8738 8738
8739 efl_gfx_size_hint_weight_set(sd->legacy.edje, weight_x, weight_y); 8739 efl_gfx_hint_weight_set(sd->legacy.edje, weight_x, weight_y);
8740 //evas_object_smart_changed(sd->legacy.edje); 8740 //evas_object_smart_changed(sd->legacy.edje);
8741} 8741}
8742 8742
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 0f87ba78dc..af1ab0ad80 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -852,9 +852,9 @@ class @beta Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Ac
852 Efl.Screen.screen_dpi { get; } 852 Efl.Screen.screen_dpi { get; }
853 Efl.Screen.screen_rotation { get; } 853 Efl.Screen.screen_rotation { get; }
854 Efl.Screen.screen_size_in_pixels { get; } 854 Efl.Screen.screen_size_in_pixels { get; }
855 Efl.Gfx.Size_Hint.hint_aspect { set; } 855 Efl.Gfx.Hint.hint_aspect { set; }
856 Efl.Gfx.Size_Hint.hint_weight { set; } 856 Efl.Gfx.Hint.hint_weight { set; }
857 Efl.Gfx.Size_Hint.hint_max { set; } 857 Efl.Gfx.Hint.hint_size_max { set; }
858 Efl.Text.text { get; set; } 858 Efl.Text.text { get; set; }
859 Efl.Canvas.Scene.pointer_position { get; } 859 Efl.Canvas.Scene.pointer_position { get; }
860 Efl.Canvas.Pointer.pointer_inside { get; } 860 Efl.Canvas.Pointer.pointer_inside { get; }
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index 01e2cebc3b..57d6126c0c 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -212,7 +212,7 @@ _shrink_mode_set(Evas_Object *obj,
212 if (sd->label && sd->label_packed) 212 if (sd->label && sd->label_packed)
213 { 213 {
214 elm_box_pack_end(sd->box, sd->label); 214 elm_box_pack_end(sd->box, sd->label);
215 w -= efl_gfx_size_hint_combined_min_get(sd->label).w; 215 w -= efl_gfx_hint_size_combined_min_get(sd->label).w;
216 w -= box_inner_item_width_padding; 216 w -= box_inner_item_width_padding;
217 } 217 }
218 218
@@ -229,7 +229,7 @@ _shrink_mode_set(Evas_Object *obj,
229 evas_object_show(VIEW(item)); 229 evas_object_show(VIEW(item));
230 item->visible = EINA_TRUE; 230 item->visible = EINA_TRUE;
231 231
232 w -= efl_gfx_size_hint_combined_min_get(VIEW(item)).w; 232 w -= efl_gfx_hint_size_combined_min_get(VIEW(item)).w;
233 w -= box_inner_item_width_padding; 233 w -= box_inner_item_width_padding;
234 count--; 234 count--;
235 235
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index b19f006bb7..851c42f642 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -1890,7 +1890,7 @@ static inline void
1890_palette_box_prepare(Eo *o) 1890_palette_box_prepare(Eo *o)
1891{ 1891{
1892 efl_ui_direction_set(o, EFL_UI_DIR_HORIZONTAL); 1892 efl_ui_direction_set(o, EFL_UI_DIR_HORIZONTAL);
1893 efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 1893 efl_gfx_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1894 efl_gfx_entity_visible_set(o, EINA_FALSE); 1894 efl_gfx_entity_visible_set(o, EINA_FALSE);
1895} 1895}
1896 1896
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index 9a25131fdb..9e8e1e21ab 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -341,13 +341,13 @@ typedef Efl_Input_Flags Evas_Event_Flags;
341#define EVAS_EVENT_FLAG_ON_HOLD EFL_INPUT_FLAGS_PROCESSED 341#define EVAS_EVENT_FLAG_ON_HOLD EFL_INPUT_FLAGS_PROCESSED
342#define EVAS_EVENT_FLAG_ON_SCROLL EFL_INPUT_FLAGS_SCROLLING 342#define EVAS_EVENT_FLAG_ON_SCROLL EFL_INPUT_FLAGS_SCROLLING
343 343
344typedef Efl_Gfx_Size_Hint_Aspect Evas_Aspect_Control; /**< Aspect types/policies for scaling size hints, used for evas_object_size_hint_aspect_set */ 344typedef Efl_Gfx_Hint_Aspect Evas_Aspect_Control; /**< Aspect types/policies for scaling size hints, used for evas_object_size_hint_aspect_set */
345 345
346#define EVAS_ASPECT_CONTROL_NONE EFL_GFX_SIZE_HINT_ASPECT_NONE 346#define EVAS_ASPECT_CONTROL_NONE EFL_GFX_HINT_ASPECT_NONE
347#define EVAS_ASPECT_CONTROL_NEITHER EFL_GFX_SIZE_HINT_ASPECT_NEITHER 347#define EVAS_ASPECT_CONTROL_NEITHER EFL_GFX_HINT_ASPECT_NEITHER
348#define EVAS_ASPECT_CONTROL_HORIZONTAL EFL_GFX_SIZE_HINT_ASPECT_HORIZONTAL 348#define EVAS_ASPECT_CONTROL_HORIZONTAL EFL_GFX_HINT_ASPECT_HORIZONTAL
349#define EVAS_ASPECT_CONTROL_VERTICAL EFL_GFX_SIZE_HINT_ASPECT_VERTICAL 349#define EVAS_ASPECT_CONTROL_VERTICAL EFL_GFX_HINT_ASPECT_VERTICAL
350#define EVAS_ASPECT_CONTROL_BOTH EFL_GFX_SIZE_HINT_ASPECT_BOTH 350#define EVAS_ASPECT_CONTROL_BOTH EFL_GFX_HINT_ASPECT_BOTH
351 351
352typedef Efl_Text_Bidirectional_Type Evas_BiDi_Direction; 352typedef Efl_Text_Bidirectional_Type Evas_BiDi_Direction;
353 353
diff --git a/src/lib/evas/Evas_Internal.h b/src/lib/evas/Evas_Internal.h
index 6fd25c91cb..da1330f16c 100644
--- a/src/lib/evas/Evas_Internal.h
+++ b/src/lib/evas/Evas_Internal.h
@@ -56,7 +56,7 @@ static inline void
56evas_object_size_hint_combined_min_get(const Eo *obj, int *w, int *h) 56evas_object_size_hint_combined_min_get(const Eo *obj, int *w, int *h)
57{ 57{
58 Eina_Size2D sz; 58 Eina_Size2D sz;
59 sz = efl_gfx_size_hint_combined_min_get(obj); 59 sz = efl_gfx_hint_size_combined_min_get(obj);
60 if (w) *w = sz.w; 60 if (w) *w = sz.w;
61 if (h) *h = sz.h; 61 if (h) *h = sz.h;
62} 62}
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index 7e4684944d..ceb5df1f55 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -1895,21 +1895,21 @@ EAPI void evas_object_size_hint_aspect_get(const Evas_Object *obj, Evas_Aspect_C
1895/** Display mode size hint. */ 1895/** Display mode size hint. */
1896typedef enum 1896typedef enum
1897{ 1897{
1898 EFL_GFX_SIZE_HINT_MODE_NONE = 0, /**< Default mode */ 1898 EFL_GFX_HINT_MODE_NONE = 0, /**< Default mode */
1899 EFL_GFX_SIZE_HINT_MODE_COMPRESS = 1, /**< Use this mode when you want to give 1899 EFL_GFX_HINT_MODE_COMPRESS = 1, /**< Use this mode when you want to give
1900 * compress display mode hint to an object */ 1900 * compress display mode hint to an object */
1901 EFL_GFX_SIZE_HINT_MODE_EXPAND = 2, /**< Use this mode when you want to give 1901 EFL_GFX_HINT_MODE_EXPAND = 2, /**< Use this mode when you want to give
1902 * expand display mode hint to an object */ 1902 * expand display mode hint to an object */
1903 EFL_GFX_SIZE_HINT_MODE_DONT_CHANGE = 3 /**< Use this mode when an object 1903 EFL_GFX_HINT_MODE_DONT_CHANGE = 3 /**< Use this mode when an object
1904 * should not change its display mode */ 1904 * should not change its display mode */
1905} Efl_Gfx_Size_Hint_Mode; 1905} Efl_Gfx_Hint_Mode;
1906 1906
1907typedef Efl_Gfx_Size_Hint_Mode Evas_Display_Mode; 1907typedef Efl_Gfx_Hint_Mode Evas_Display_Mode;
1908 1908
1909#define EVAS_DISPLAY_MODE_NONE EFL_GFX_SIZE_HINT_MODE_NONE 1909#define EVAS_DISPLAY_MODE_NONE EFL_GFX_HINT_MODE_NONE
1910#define EVAS_DISPLAY_MODE_COMPRESS EFL_GFX_SIZE_HINT_MODE_COMPRESS 1910#define EVAS_DISPLAY_MODE_COMPRESS EFL_GFX_HINT_MODE_COMPRESS
1911#define EVAS_DISPLAY_MODE_EXPAND EFL_GFX_SIZE_HINT_MODE_EXPAND 1911#define EVAS_DISPLAY_MODE_EXPAND EFL_GFX_HINT_MODE_EXPAND
1912#define EVAS_DISPLAY_MODE_DONT_CHANGE EFL_GFX_SIZE_HINT_MODE_DONT_CHANGE 1912#define EVAS_DISPLAY_MODE_DONT_CHANGE EFL_GFX_HINT_MODE_DONT_CHANGE
1913 1913
1914/** 1914/**
1915 * @brief Sets the hints for an object's disply mode, 1915 * @brief Sets the hints for an object's disply mode,
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index 7ae78d61c2..35a2a3bf57 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -3,7 +3,7 @@ import efl_text_types;
3struct Efl.Canvas.Object_Animation_Event; [[Information of animation events]] 3struct Efl.Canvas.Object_Animation_Event; [[Information of animation events]]
4 4
5abstract @beta Efl.Canvas.Object extends Efl.Loop_Consumer implements Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Animator, 5abstract @beta Efl.Canvas.Object extends Efl.Loop_Consumer implements Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Animator,
6 Efl.Input.Interface, Efl.Gfx.Size_Hint, 6 Efl.Input.Interface, Efl.Gfx.Hint,
7 Efl.Gfx.Map, Efl.Ui.I18n, Efl.Canvas.Pointer 7 Efl.Gfx.Map, Efl.Ui.I18n, Efl.Canvas.Pointer
8{ 8{
9 [[Efl canvas object abstract class]] 9 [[Efl canvas object abstract class]]
@@ -600,15 +600,15 @@ abstract @beta Efl.Canvas.Object extends Efl.Loop_Consumer implements Efl.Gfx.En
600 Efl.Gfx.Stack.stack_above; 600 Efl.Gfx.Stack.stack_above;
601 Efl.Gfx.Stack.raise_to_top; 601 Efl.Gfx.Stack.raise_to_top;
602 Efl.Gfx.Stack.lower_to_bottom; 602 Efl.Gfx.Stack.lower_to_bottom;
603 Efl.Gfx.Size_Hint.hint_aspect { get; set; } 603 Efl.Gfx.Hint.hint_aspect { get; set; }
604 Efl.Gfx.Size_Hint.hint_align { get; set; } 604 Efl.Gfx.Hint.hint_align { get; set; }
605 Efl.Gfx.Size_Hint.hint_combined_min { get; } 605 Efl.Gfx.Hint.hint_size_combined_min { get; }
606 Efl.Gfx.Size_Hint.hint_restricted_min { get; set; } 606 Efl.Gfx.Hint.hint_size_restricted_min { get; set; }
607 Efl.Gfx.Size_Hint.hint_min { get; set; } 607 Efl.Gfx.Hint.hint_size_min { get; set; }
608 Efl.Gfx.Size_Hint.hint_max { get; set; } 608 Efl.Gfx.Hint.hint_size_max { get; set; }
609 Efl.Gfx.Size_Hint.hint_margin { get; set; } 609 Efl.Gfx.Hint.hint_margin { get; set; }
610 Efl.Gfx.Size_Hint.hint_weight { get; set; } 610 Efl.Gfx.Hint.hint_weight { get; set; }
611 Efl.Gfx.Size_Hint.hint_fill { get; set; } 611 Efl.Gfx.Hint.hint_fill { get; set; }
612 Efl.Gfx.Entity.scale { set; get; } 612 Efl.Gfx.Entity.scale { set; get; }
613 Efl.Input.Interface.seat_event_filter { get; set; } 613 Efl.Input.Interface.seat_event_filter { get; set; }
614 Efl.Loop_Consumer.loop { get; } 614 Efl.Loop_Consumer.loop { get; }
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index fa44327564..38e81d5141 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -1,5 +1,5 @@
1#define EFL_CANVAS_OBJECT_PROTECTED 1#define EFL_CANVAS_OBJECT_PROTECTED
2#define EFL_GFX_SIZE_HINT_PROTECTED 2#define EFL_GFX_HINT_PROTECTED
3 3
4#include "evas_common_private.h" 4#include "evas_common_private.h"
5#include "evas_private.h" 5#include "evas_private.h"
@@ -322,7 +322,7 @@ _efl_canvas_object_efl_object_finalize(Eo *eo_obj, Evas_Object_Protected_Data *o
322 if (obj->legacy.ctor) goto end; 322 if (obj->legacy.ctor) goto end;
323 323
324 if (!obj->legacy.weight_set) 324 if (!obj->legacy.weight_set)
325 efl_gfx_size_hint_weight_set(eo_obj, 1.0, 1.0); 325 efl_gfx_hint_weight_set(eo_obj, 1.0, 1.0);
326 326
327 if (obj->legacy.visible_set /* && ... */) 327 if (obj->legacy.visible_set /* && ... */)
328 { 328 {
@@ -1636,7 +1636,7 @@ evas_object_size_hint_display_mode_set(Eo *eo_obj, Evas_Display_Mode dispmode)
1636} 1636}
1637 1637
1638EOLIAN static Eina_Size2D 1638EOLIAN static Eina_Size2D
1639_efl_canvas_object_efl_gfx_size_hint_hint_restricted_min_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) 1639_efl_canvas_object_efl_gfx_hint_hint_size_restricted_min_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
1640{ 1640{
1641 if ((!obj->size_hints) || obj->delete_me) 1641 if ((!obj->size_hints) || obj->delete_me)
1642 return EINA_SIZE2D(0, 0); 1642 return EINA_SIZE2D(0, 0);
@@ -1645,7 +1645,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_restricted_min_get(const Eo *eo_obj EI
1645} 1645}
1646 1646
1647EOLIAN static void 1647EOLIAN static void
1648_efl_canvas_object_efl_gfx_size_hint_hint_restricted_min_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Size2D sz) 1648_efl_canvas_object_efl_gfx_hint_hint_size_restricted_min_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Size2D sz)
1649{ 1649{
1650 if (obj->delete_me) 1650 if (obj->delete_me)
1651 return; 1651 return;
@@ -1664,7 +1664,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_restricted_min_set(Eo *eo_obj, Evas_Ob
1664} 1664}
1665 1665
1666EOLIAN static Eina_Size2D 1666EOLIAN static Eina_Size2D
1667_efl_canvas_object_efl_gfx_size_hint_hint_combined_min_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) 1667_efl_canvas_object_efl_gfx_hint_hint_size_combined_min_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
1668{ 1668{
1669 Eina_Size2D sz = { 0, 0 }; 1669 Eina_Size2D sz = { 0, 0 };
1670 1670
@@ -1677,7 +1677,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_combined_min_get(const Eo *eo_obj EINA
1677} 1677}
1678 1678
1679EOLIAN static Eina_Size2D 1679EOLIAN static Eina_Size2D
1680_efl_canvas_object_efl_gfx_size_hint_hint_max_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) 1680_efl_canvas_object_efl_gfx_hint_hint_size_max_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
1681{ 1681{
1682 if ((!obj->size_hints) || obj->delete_me) 1682 if ((!obj->size_hints) || obj->delete_me)
1683 return EINA_SIZE2D(-1, -1); 1683 return EINA_SIZE2D(-1, -1);
@@ -1686,7 +1686,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_max_get(const Eo *eo_obj EINA_UNUSED,
1686} 1686}
1687 1687
1688EOLIAN static void 1688EOLIAN static void
1689_efl_canvas_object_efl_gfx_size_hint_hint_max_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Size2D sz) 1689_efl_canvas_object_efl_gfx_hint_hint_size_max_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Size2D sz)
1690{ 1690{
1691 if (obj->delete_me) 1691 if (obj->delete_me)
1692 return; 1692 return;
@@ -1741,7 +1741,7 @@ evas_object_size_hint_request_set(Eo *eo_obj, Evas_Coord w, Evas_Coord h)
1741} 1741}
1742 1742
1743EOLIAN static Eina_Size2D 1743EOLIAN static Eina_Size2D
1744_efl_canvas_object_efl_gfx_size_hint_hint_min_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) 1744_efl_canvas_object_efl_gfx_hint_hint_size_min_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
1745{ 1745{
1746 if ((!obj->size_hints) || obj->delete_me) 1746 if ((!obj->size_hints) || obj->delete_me)
1747 return EINA_SIZE2D(0, 0); 1747 return EINA_SIZE2D(0, 0);
@@ -1750,7 +1750,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_min_get(const Eo *eo_obj EINA_UNUSED,
1750} 1750}
1751 1751
1752EOLIAN static void 1752EOLIAN static void
1753_efl_canvas_object_efl_gfx_size_hint_hint_min_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Size2D sz) 1753_efl_canvas_object_efl_gfx_hint_hint_size_min_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Size2D sz)
1754{ 1754{
1755 if (obj->delete_me) 1755 if (obj->delete_me)
1756 return; 1756 return;
@@ -1769,7 +1769,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_min_set(Eo *eo_obj, Evas_Object_Protec
1769} 1769}
1770 1770
1771EOLIAN static void 1771EOLIAN static void
1772_efl_canvas_object_efl_gfx_size_hint_hint_aspect_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Efl_Gfx_Size_Hint_Aspect *aspect, Eina_Size2D *sz) 1772_efl_canvas_object_efl_gfx_hint_hint_aspect_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Efl_Gfx_Hint_Aspect *aspect, Eina_Size2D *sz)
1773{ 1773{
1774 if ((!obj->size_hints) || obj->delete_me) 1774 if ((!obj->size_hints) || obj->delete_me)
1775 { 1775 {
@@ -1786,7 +1786,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_aspect_get(const Eo *eo_obj EINA_UNUSE
1786} 1786}
1787 1787
1788EOLIAN static void 1788EOLIAN static void
1789_efl_canvas_object_efl_gfx_size_hint_hint_aspect_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Efl_Gfx_Size_Hint_Aspect aspect, Eina_Size2D sz) 1789_efl_canvas_object_efl_gfx_hint_hint_aspect_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Efl_Gfx_Hint_Aspect aspect, Eina_Size2D sz)
1790{ 1790{
1791 if (obj->delete_me) 1791 if (obj->delete_me)
1792 return; 1792 return;
@@ -1808,7 +1808,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_aspect_set(Eo *eo_obj, Evas_Object_Pro
1808} 1808}
1809 1809
1810EOLIAN static void 1810EOLIAN static void
1811_efl_canvas_object_efl_gfx_size_hint_hint_align_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, double *x, double *y) 1811_efl_canvas_object_efl_gfx_hint_hint_align_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, double *x, double *y)
1812{ 1812{
1813 if ((!obj->size_hints) || obj->delete_me) 1813 if ((!obj->size_hints) || obj->delete_me)
1814 { 1814 {
@@ -1821,7 +1821,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_align_get(const Eo *eo_obj EINA_UNUSED
1821} 1821}
1822 1822
1823EOLIAN static void 1823EOLIAN static void
1824_efl_canvas_object_efl_gfx_size_hint_hint_align_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double x, double y) 1824_efl_canvas_object_efl_gfx_hint_hint_align_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double x, double y)
1825{ 1825{
1826 if (obj->delete_me) 1826 if (obj->delete_me)
1827 return; 1827 return;
@@ -1843,7 +1843,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_align_set(Eo *eo_obj, Evas_Object_Prot
1843} 1843}
1844 1844
1845EOLIAN static void 1845EOLIAN static void
1846_efl_canvas_object_efl_gfx_size_hint_hint_weight_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, double *x, double *y) 1846_efl_canvas_object_efl_gfx_hint_hint_weight_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, double *x, double *y)
1847{ 1847{
1848 if ((!obj->size_hints) || obj->delete_me) 1848 if ((!obj->size_hints) || obj->delete_me)
1849 { 1849 {
@@ -1856,7 +1856,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_weight_get(const Eo *eo_obj EINA_UNUSE
1856} 1856}
1857 1857
1858EOLIAN static void 1858EOLIAN static void
1859_efl_canvas_object_efl_gfx_size_hint_hint_weight_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double x, double y) 1859_efl_canvas_object_efl_gfx_hint_hint_weight_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double x, double y)
1860{ 1860{
1861 if (obj->delete_me) 1861 if (obj->delete_me)
1862 return; 1862 return;
@@ -1879,7 +1879,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_weight_set(Eo *eo_obj, Evas_Object_Pro
1879} 1879}
1880 1880
1881EOLIAN static void 1881EOLIAN static void
1882_efl_canvas_object_efl_gfx_size_hint_hint_margin_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b) 1882_efl_canvas_object_efl_gfx_hint_hint_margin_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b)
1883{ 1883{
1884 if ((!obj->size_hints) || obj->delete_me) 1884 if ((!obj->size_hints) || obj->delete_me)
1885 { 1885 {
@@ -1896,7 +1896,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_margin_get(const Eo *eo_obj EINA_UNUSE
1896} 1896}
1897 1897
1898EOLIAN static void 1898EOLIAN static void
1899_efl_canvas_object_efl_gfx_size_hint_hint_margin_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord l, Evas_Coord r, Evas_Coord t, Evas_Coord b) 1899_efl_canvas_object_efl_gfx_hint_hint_margin_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord l, Evas_Coord r, Evas_Coord t, Evas_Coord b)
1900{ 1900{
1901 if (obj->delete_me) 1901 if (obj->delete_me)
1902 return; 1902 return;
@@ -1918,7 +1918,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_margin_set(Eo *eo_obj, Evas_Object_Pro
1918} 1918}
1919 1919
1920EOLIAN static void 1920EOLIAN static void
1921_efl_canvas_object_efl_gfx_size_hint_hint_fill_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Eina_Bool *x, Eina_Bool *y) 1921_efl_canvas_object_efl_gfx_hint_hint_fill_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Eina_Bool *x, Eina_Bool *y)
1922{ 1922{
1923 if ((!obj->size_hints) || obj->delete_me) 1923 if ((!obj->size_hints) || obj->delete_me)
1924 { 1924 {
@@ -1931,7 +1931,7 @@ _efl_canvas_object_efl_gfx_size_hint_hint_fill_get(const Eo *eo_obj EINA_UNUSED,
1931} 1931}
1932 1932
1933EOLIAN static void 1933EOLIAN static void
1934_efl_canvas_object_efl_gfx_size_hint_hint_fill_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool x, Eina_Bool y) 1934_efl_canvas_object_efl_gfx_hint_hint_fill_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool x, Eina_Bool y)
1935{ 1935{
1936 if (obj->delete_me) 1936 if (obj->delete_me)
1937 return; 1937 return;
@@ -2378,12 +2378,12 @@ _efl_canvas_object_efl_object_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Dat
2378 name = efl_name_get(eo_obj); // evas_object_name_get(eo_obj); 2378 name = efl_name_get(eo_obj); // evas_object_name_get(eo_obj);
2379 geom = efl_gfx_entity_geometry_get(eo_obj); 2379 geom = efl_gfx_entity_geometry_get(eo_obj);
2380 scale = efl_gfx_entity_scale_get(eo_obj); 2380 scale = efl_gfx_entity_scale_get(eo_obj);
2381 min = efl_gfx_size_hint_restricted_min_get(eo_obj); 2381 min = efl_gfx_hint_size_restricted_min_get(eo_obj);
2382 max = efl_gfx_size_hint_max_get(eo_obj); 2382 max = efl_gfx_hint_size_max_get(eo_obj);
2383 //efl_gfx_size_hint_request_get(eo_obj, &requestw, &requesth); 2383 //efl_gfx_hint_request_get(eo_obj, &requestw, &requesth);
2384 efl_gfx_size_hint_align_get(eo_obj, &dblx, &dbly); 2384 efl_gfx_hint_align_get(eo_obj, &dblx, &dbly);
2385 efl_gfx_size_hint_weight_get(eo_obj, &dblw, &dblh); 2385 efl_gfx_hint_weight_get(eo_obj, &dblw, &dblh);
2386 efl_gfx_size_hint_fill_get(eo_obj, &fillx, &filly); 2386 efl_gfx_hint_fill_get(eo_obj, &fillx, &filly);
2387 efl_gfx_color_get(eo_obj, &r, &g, &b, &a); 2387 efl_gfx_color_get(eo_obj, &r, &g, &b, &a);
2388 focus = evas_object_focus_get(eo_obj); 2388 focus = evas_object_focus_get(eo_obj);
2389 m = efl_canvas_object_pointer_mode_get(eo_obj); 2389 m = efl_canvas_object_pointer_mode_get(eo_obj);
@@ -2740,14 +2740,14 @@ evas_object_static_clip_get(const Evas_Object *eo_obj)
2740EAPI void 2740EAPI void
2741evas_object_size_hint_aspect_set(Evas_Object *obj, Evas_Aspect_Control aspect, Evas_Coord w, Evas_Coord h) 2741evas_object_size_hint_aspect_set(Evas_Object *obj, Evas_Aspect_Control aspect, Evas_Coord w, Evas_Coord h)
2742{ 2742{
2743 efl_gfx_size_hint_aspect_set(obj, aspect, EINA_SIZE2D(w, h)); 2743 efl_gfx_hint_aspect_set(obj, aspect, EINA_SIZE2D(w, h));
2744} 2744}
2745 2745
2746EAPI void 2746EAPI void
2747evas_object_size_hint_aspect_get(const Evas_Object *obj, Evas_Aspect_Control *aspect, Evas_Coord *w, Evas_Coord *h) 2747evas_object_size_hint_aspect_get(const Evas_Object *obj, Evas_Aspect_Control *aspect, Evas_Coord *w, Evas_Coord *h)
2748{ 2748{
2749 Eina_Size2D sz = { 0, 0 }; 2749 Eina_Size2D sz = { 0, 0 };
2750 efl_gfx_size_hint_aspect_get(obj, aspect, &sz); 2750 efl_gfx_hint_aspect_get(obj, aspect, &sz);
2751 if (w) *w = sz.w; 2751 if (w) *w = sz.w;
2752 if (h) *h = sz.h; 2752 if (h) *h = sz.h;
2753} 2753}
@@ -2755,14 +2755,14 @@ evas_object_size_hint_aspect_get(const Evas_Object *obj, Evas_Aspect_Control *as
2755EAPI void 2755EAPI void
2756evas_object_size_hint_max_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) 2756evas_object_size_hint_max_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
2757{ 2757{
2758 efl_gfx_size_hint_max_set(obj, EINA_SIZE2D(w, h)); 2758 efl_gfx_hint_size_max_set(obj, EINA_SIZE2D(w, h));
2759} 2759}
2760 2760
2761EAPI void 2761EAPI void
2762evas_object_size_hint_max_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) 2762evas_object_size_hint_max_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
2763{ 2763{
2764 Eina_Size2D sz; 2764 Eina_Size2D sz;
2765 sz = efl_gfx_size_hint_max_get(obj); 2765 sz = efl_gfx_hint_size_max_get(obj);
2766 if (w) *w = sz.w; 2766 if (w) *w = sz.w;
2767 if (h) *h = sz.h; 2767 if (h) *h = sz.h;
2768} 2768}
@@ -2770,14 +2770,14 @@ evas_object_size_hint_max_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord
2770EAPI void 2770EAPI void
2771evas_object_size_hint_min_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) 2771evas_object_size_hint_min_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
2772{ 2772{
2773 efl_gfx_size_hint_restricted_min_set(obj, EINA_SIZE2D(w, h)); 2773 efl_gfx_hint_size_restricted_min_set(obj, EINA_SIZE2D(w, h));
2774} 2774}
2775 2775
2776EAPI void 2776EAPI void
2777evas_object_size_hint_min_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) 2777evas_object_size_hint_min_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
2778{ 2778{
2779 Eina_Size2D sz; 2779 Eina_Size2D sz;
2780 sz = efl_gfx_size_hint_restricted_min_get(obj); 2780 sz = efl_gfx_hint_size_restricted_min_get(obj);
2781 if (w) *w = sz.w; 2781 if (w) *w = sz.w;
2782 if (h) *h = sz.h; 2782 if (h) *h = sz.h;
2783} 2783}
@@ -2785,37 +2785,37 @@ evas_object_size_hint_min_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord
2785EAPI void 2785EAPI void
2786evas_object_size_hint_padding_set(Evas_Object *obj, Evas_Coord l, Evas_Coord r, Evas_Coord t, Evas_Coord b) 2786evas_object_size_hint_padding_set(Evas_Object *obj, Evas_Coord l, Evas_Coord r, Evas_Coord t, Evas_Coord b)
2787{ 2787{
2788 efl_gfx_size_hint_margin_set(obj, l, r, t, b); 2788 efl_gfx_hint_margin_set(obj, l, r, t, b);
2789} 2789}
2790 2790
2791EAPI void 2791EAPI void
2792evas_object_size_hint_padding_get(const Evas_Object *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b) 2792evas_object_size_hint_padding_get(const Evas_Object *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b)
2793{ 2793{
2794 efl_gfx_size_hint_margin_get(obj, l, r, t, b); 2794 efl_gfx_hint_margin_get(obj, l, r, t, b);
2795} 2795}
2796 2796
2797EAPI void 2797EAPI void
2798evas_object_size_hint_weight_set(Evas_Object *obj, double x, double y) 2798evas_object_size_hint_weight_set(Evas_Object *obj, double x, double y)
2799{ 2799{
2800 efl_gfx_size_hint_weight_set(obj, x, y); 2800 efl_gfx_hint_weight_set(obj, x, y);
2801} 2801}
2802 2802
2803EAPI void 2803EAPI void
2804evas_object_size_hint_weight_get(const Evas_Object *obj, double *x, double *y) 2804evas_object_size_hint_weight_get(const Evas_Object *obj, double *x, double *y)
2805{ 2805{
2806 efl_gfx_size_hint_weight_get(obj, x, y); 2806 efl_gfx_hint_weight_get(obj, x, y);
2807} 2807}
2808 2808
2809EAPI void 2809EAPI void
2810evas_object_size_hint_align_set(Evas_Object *obj, double x, double y) 2810evas_object_size_hint_align_set(Evas_Object *obj, double x, double y)
2811{ 2811{
2812 efl_gfx_size_hint_align_set(obj, x, y); 2812 efl_gfx_hint_align_set(obj, x, y);
2813} 2813}
2814 2814
2815EAPI void 2815EAPI void
2816evas_object_size_hint_align_get(const Evas_Object *obj, double *x, double *y) 2816evas_object_size_hint_align_get(const Evas_Object *obj, double *x, double *y)
2817{ 2817{
2818 efl_gfx_size_hint_align_get(obj, x, y); 2818 efl_gfx_hint_align_get(obj, x, y);
2819} 2819}
2820 2820
2821EAPI Evas * 2821EAPI Evas *
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index fb49c4abc4..1e304256bd 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -350,7 +350,7 @@ _evas_object_table_calculate_hints_homogeneous(Evas_Object *o, Evas_Table_Data *
350 evas_object_size_hint_align_get(child, &opt->align.h, &opt->align.v); 350 evas_object_size_hint_align_get(child, &opt->align.h, &opt->align.v);
351 evas_object_size_hint_weight_get(child, &weightw, &weighth); 351 evas_object_size_hint_weight_get(child, &weightw, &weighth);
352 //only for Efl.Ui.Table 352 //only for Efl.Ui.Table
353 efl_gfx_size_hint_fill_get(child, &fill_h, &fill_v); 353 efl_gfx_hint_fill_get(child, &fill_h, &fill_v);
354 354
355 child_minw = opt->min.w + opt->pad.l + opt->pad.r; 355 child_minw = opt->min.w + opt->pad.l + opt->pad.r;
356 child_minh = opt->min.h + opt->pad.t + opt->pad.b; 356 child_minh = opt->min.h + opt->pad.t + opt->pad.b;
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index 80c960bda9..06150e7cbd 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -2897,7 +2897,7 @@ evas_render_pre(Evas *eo_e, Evas_Public_Data *evas)
2897 2897
2898 // weight should be set during finalize() 2898 // weight should be set during finalize()
2899 if (EINA_UNLIKELY(!obj->legacy.weight_set)) 2899 if (EINA_UNLIKELY(!obj->legacy.weight_set))
2900 efl_gfx_size_hint_weight_set(eo_obj, 1.0, 1.0); 2900 efl_gfx_hint_weight_set(eo_obj, 1.0, 1.0);
2901 } 2901 }
2902 2902
2903 eina_evlog("-render_pre_objects_finalize", eo_e, 0.0, NULL); 2903 eina_evlog("-render_pre_objects_finalize", eo_e, 0.0, NULL);