summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-09-16 11:08:23 +0200
committerXavi Artigas <xavierartigas@yahoo.es>2019-09-16 11:08:23 +0200
commit5daac17e990d8cd3c1eb6e6b41e65b814eeb1920 (patch)
tree741dfb2d6f770046323ff17612f46fb678fb1281
parent944d5f37c7add5772a62d0d976db48b3a2a90982 (diff)
efl/image: Efl.Gfx.Border_Fill_Mode -> Efl.Gfx.Center_Fill_Mode
Summary: rename this to match its function ref T7926, T7875 Depends on D9932 Subscribers: cedric, #reviewers, #committers Tags: #efl_api Maniphest Tasks: T7926, T7875 Differential Revision: https://phab.enlightenment.org/D9933
-rw-r--r--src/examples/evas/evas-object-manipulation-eo.c2
-rw-r--r--src/lib/efl/interfaces/efl_gfx_image.eo10
-rw-r--r--src/lib/efl/interfaces/efl_gfx_types.eot2
-rw-r--r--src/lib/evas/canvas/efl_canvas_image_internal.eo2
-rw-r--r--src/lib/evas/canvas/evas_image_legacy.c4
-rw-r--r--src/lib/evas/canvas/evas_object_image.c8
6 files changed, 14 insertions, 14 deletions
diff --git a/src/examples/evas/evas-object-manipulation-eo.c b/src/examples/evas/evas-object-manipulation-eo.c
index 7ba391a..a3d5949 100644
--- a/src/examples/evas/evas-object-manipulation-eo.c
+++ b/src/examples/evas/evas-object-manipulation-eo.c
@@ -221,7 +221,7 @@ main(void)
221 else 221 else
222 { 222 {
223 efl_gfx_image_border_set(d.clipper_border, 3, 3, 3, 3); 223 efl_gfx_image_border_set(d.clipper_border, 3, 3, 3, 3);
224 efl_gfx_image_border_center_fill_set(d.clipper_border, EFL_GFX_BORDER_FILL_MODE_NONE); 224 efl_gfx_image_center_fill_mode_set(d.clipper_border, EFL_GFX_CENTER_FILL_MODE_NONE);
225 efl_gfx_entity_position_set(d.clipper_border, EINA_POSITION2D((WIDTH / 4) -3, (HEIGHT / 4) - 3)); 225 efl_gfx_entity_position_set(d.clipper_border, EINA_POSITION2D((WIDTH / 4) -3, (HEIGHT / 4) - 3));
226 efl_gfx_entity_size_set(d.clipper_border, EINA_SIZE2D((WIDTH / 2) + 6, (HEIGHT / 2) + 6)); 226 efl_gfx_entity_size_set(d.clipper_border, EINA_SIZE2D((WIDTH / 2) + 6, (HEIGHT / 2) + 6));
227 efl_gfx_entity_visible_set(d.clipper_border, EINA_TRUE); 227 efl_gfx_entity_visible_set(d.clipper_border, EINA_TRUE);
diff --git a/src/lib/efl/interfaces/efl_gfx_image.eo b/src/lib/efl/interfaces/efl_gfx_image.eo
index bfaa48e..b3157fb 100644
--- a/src/lib/efl/interfaces/efl_gfx_image.eo
+++ b/src/lib/efl/interfaces/efl_gfx_image.eo
@@ -179,13 +179,13 @@ interface @beta Efl.Gfx.Image
179 scale: double; [[The scale factor. The default value is $[1.0].]] 179 scale: double; [[The scale factor. The default value is $[1.0].]]
180 } 180 }
181 } 181 }
182 @property border_center_fill { 182 @property center_fill_mode {
183 [[Specifies how the center part of the object (not the borders) 183 [[Specifies how the center part of the object (not the borders)
184 should be drawn when EFL is rendering it. 184 should be drawn when EFL is rendering it.
185 185
186 This function sets how the center part of the image object's 186 This function sets how the center part of the image object's
187 source image is to be drawn, which must be one of the values 187 source image is to be drawn, which must be one of the values
188 in @Efl.Gfx.Border_Fill_Mode. By center we mean the complementary 188 in @Efl.Gfx.Center_Fill_Mode. By center we mean the complementary
189 part of that defined by @.border.set. This is very useful for 189 part of that defined by @.border.set. This is very useful for
190 making frames and decorations. You would most probably also be 190 making frames and decorations. You would most probably also be
191 using a filled image (as in @Efl.Gfx.Fill.fill_auto) to use as a frame. 191 using a filled image (as in @Efl.Gfx.Fill.fill_auto) to use as a frame.
@@ -193,8 +193,8 @@ interface @beta Efl.Gfx.Image
193 set {} 193 set {}
194 get {} 194 get {}
195 values { 195 values {
196 fill: Efl.Gfx.Border_Fill_Mode; [[Fill mode of the center region. 196 fill: Efl.Gfx.Center_Fill_Mode; [[Fill mode of the center region.
197 The default value is @Efl.Gfx.Border_Fill_Mode.default, i.e. render 197 The default value is @Efl.Gfx.Center_Fill_Mode.default, i.e. render
198 and scale the center area, respecting its transparency.]] 198 and scale the center area, respecting its transparency.]]
199 } 199 }
200 } 200 }
@@ -205,7 +205,7 @@ interface @beta Efl.Gfx.Image
205 once and then destroy them. When the regions are retrieved by the user, 205 once and then destroy them. When the regions are retrieved by the user,
206 it is his responsibility to destroy the iterators.. It will remember the 206 it is his responsibility to destroy the iterators.. It will remember the
207 information for the lifetime of the object. It will ignore all value 207 information for the lifetime of the object. It will ignore all value
208 of @.border, @.border_scale and @.border_center_fill . To reset the object 208 of @.border, @.border_scale and @.center_fill_mode . To reset the object
209 you can just pass $null to both horizontal and vertical at the same 209 you can just pass $null to both horizontal and vertical at the same
210 time. 210 time.
211 ]] 211 ]]
diff --git a/src/lib/efl/interfaces/efl_gfx_types.eot b/src/lib/efl/interfaces/efl_gfx_types.eot
index ecc0588..e0ec30a 100644
--- a/src/lib/efl/interfaces/efl_gfx_types.eot
+++ b/src/lib/efl/interfaces/efl_gfx_types.eot
@@ -152,7 +152,7 @@ enum @beta Efl.Gfx.Vg_Composite_Method
152 mask_difference 152 mask_difference
153} 153}
154 154
155enum @beta Efl.Gfx.Border_Fill_Mode 155enum @beta Efl.Gfx.Center_Fill_Mode
156{ 156{
157 [[How an image's center region (the complement to the border region) should be rendered by EFL]] 157 [[How an image's center region (the complement to the border region) should be rendered by EFL]]
158 none = 0, [[Image's center region is $not to be rendered]] 158 none = 0, [[Image's center region is $not to be rendered]]
diff --git a/src/lib/evas/canvas/efl_canvas_image_internal.eo b/src/lib/evas/canvas/efl_canvas_image_internal.eo
index 98cf494..7240a0e 100644
--- a/src/lib/evas/canvas/efl_canvas_image_internal.eo
+++ b/src/lib/evas/canvas/efl_canvas_image_internal.eo
@@ -17,7 +17,7 @@ abstract @beta Efl.Canvas.Image_Internal extends Efl.Canvas.Object implements Ef
17 Efl.Gfx.Image.content_region { get; } 17 Efl.Gfx.Image.content_region { get; }
18 Efl.Gfx.Image.border { get; set; } 18 Efl.Gfx.Image.border { get; set; }
19 Efl.Gfx.Image.border_scale { get; set; } 19 Efl.Gfx.Image.border_scale { get; set; }
20 Efl.Gfx.Image.border_center_fill { get; set; } 20 Efl.Gfx.Image.center_fill_mode { get; set; }
21 Efl.Gfx.Image.stretch_region { get; set; } 21 Efl.Gfx.Image.stretch_region { get; set; }
22 Efl.Gfx.Image.scale_hint { get; set; } 22 Efl.Gfx.Image.scale_hint { get; set; }
23 Efl.Gfx.Image.content_hint { get; set; } 23 Efl.Gfx.Image.content_hint { get; set; }
diff --git a/src/lib/evas/canvas/evas_image_legacy.c b/src/lib/evas/canvas/evas_image_legacy.c
index 441524e..63b1bce 100644
--- a/src/lib/evas/canvas/evas_image_legacy.c
+++ b/src/lib/evas/canvas/evas_image_legacy.c
@@ -145,14 +145,14 @@ EAPI void
145evas_object_image_border_center_fill_set(Evas_Object *obj, Evas_Border_Fill_Mode fill) 145evas_object_image_border_center_fill_set(Evas_Object *obj, Evas_Border_Fill_Mode fill)
146{ 146{
147 EVAS_IMAGE_API(obj); 147 EVAS_IMAGE_API(obj);
148 efl_gfx_image_border_center_fill_set(obj, (Efl_Gfx_Border_Fill_Mode) fill); 148 efl_gfx_image_center_fill_mode_set(obj, (Efl_Gfx_Center_Fill_Mode) fill);
149} 149}
150 150
151EAPI Evas_Border_Fill_Mode 151EAPI Evas_Border_Fill_Mode
152evas_object_image_border_center_fill_get(const Evas_Object *obj) 152evas_object_image_border_center_fill_get(const Evas_Object *obj)
153{ 153{
154 EVAS_IMAGE_API(obj, EVAS_BORDER_FILL_NONE); 154 EVAS_IMAGE_API(obj, EVAS_BORDER_FILL_NONE);
155 return (Evas_Border_Fill_Mode) efl_gfx_image_border_center_fill_get(obj); 155 return (Evas_Border_Fill_Mode) efl_gfx_image_center_fill_mode_get(obj);
156} 156}
157 157
158EAPI void 158EAPI void
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index 16a5dcd..7dc4584 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -626,7 +626,7 @@ _efl_canvas_image_internal_efl_gfx_image_border_get(const Eo *eo_obj EINA_UNUSED
626} 626}
627 627
628EOLIAN static void 628EOLIAN static void
629_efl_canvas_image_internal_efl_gfx_image_border_center_fill_set(Eo *eo_obj, Evas_Image_Data *o, Efl_Gfx_Border_Fill_Mode _fill) 629_efl_canvas_image_internal_efl_gfx_image_center_fill_mode_set(Eo *eo_obj, Evas_Image_Data *o, Efl_Gfx_Center_Fill_Mode _fill)
630{ 630{
631 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 631 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
632 Evas_Border_Fill_Mode fill = (Evas_Border_Fill_Mode)_fill; 632 Evas_Border_Fill_Mode fill = (Evas_Border_Fill_Mode)_fill;
@@ -641,10 +641,10 @@ _efl_canvas_image_internal_efl_gfx_image_border_center_fill_set(Eo *eo_obj, Evas
641 evas_object_change(eo_obj, obj); 641 evas_object_change(eo_obj, obj);
642} 642}
643 643
644EOLIAN static Efl_Gfx_Border_Fill_Mode 644EOLIAN static Efl_Gfx_Center_Fill_Mode
645_efl_canvas_image_internal_efl_gfx_image_border_center_fill_get(const Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) 645_efl_canvas_image_internal_efl_gfx_image_center_fill_mode_get(const Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o)
646{ 646{
647 return (Efl_Gfx_Border_Fill_Mode)o->cur->border.fill; 647 return (Efl_Gfx_Center_Fill_Mode)o->cur->border.fill;
648} 648}
649 649
650static void 650static void