diff options
author | Mike Blumenkrantz <zmike@samsung.com> | 2019-02-21 18:19:45 +0100 |
---|---|---|
committer | Xavi Artigas <xavierartigas@yahoo.es> | 2019-02-21 18:43:12 +0100 |
commit | f886941b112573664598808ab0493e83126ea2bb (patch) | |
tree | 80e9b2f2114101f180207bac4c5c218b0425e10a /src/lib/efl | |
parent | 94efabedf6475a665352ff30f4b869c5a310eb40 (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/efl/Efl.h | 4 | ||||
-rw-r--r-- | src/lib/efl/interfaces/efl_gfx_entity.eo | 2 | ||||
-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.eot | 4 | ||||
-rw-r--r-- | src/lib/efl/interfaces/efl_interfaces_main.c | 2 | ||||
-rw-r--r-- | src/lib/efl/interfaces/meson.build | 2 |
6 files changed, 27 insertions, 27 deletions
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 @@ | |||
1 | import eina_types; | 1 | import eina_types; |
2 | import efl_gfx_types; | 2 | import efl_gfx_types; |
3 | 3 | ||
4 | const Efl.Gfx.Size_Hint_Expand: double = 1.0; | 4 | const 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 | ||
7 | interface @beta Efl.Gfx.Size_Hint | 7 | interface @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 | ||
172 | enum Efl.Gfx.Size_Hint_Aspect | 172 | enum 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', |