enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

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
This commit is contained in:
Mike Blumenkrantz 2019-09-16 11:08:23 +02:00 committed by Xavi Artigas
parent 944d5f37c7
commit 5daac17e99
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/examples/evas/evas-object-manipulation-eo.c
View File

@ -221,7 +221,7 @@ main(void)
else
{
efl_gfx_image_border_set(d.clipper_border, 3, 3, 3, 3);
efl_gfx_image_border_center_fill_set(d.clipper_border, EFL_GFX_BORDER_FILL_MODE_NONE);
efl_gfx_image_center_fill_mode_set(d.clipper_border, EFL_GFX_CENTER_FILL_MODE_NONE);
efl_gfx_entity_position_set(d.clipper_border, EINA_POSITION2D((WIDTH / 4) -3, (HEIGHT / 4) - 3));
efl_gfx_entity_size_set(d.clipper_border, EINA_SIZE2D((WIDTH / 2) + 6, (HEIGHT / 2) + 6));
efl_gfx_entity_visible_set(d.clipper_border, EINA_TRUE);

10
src/lib/efl/interfaces/efl_gfx_image.eo
View File

@ -179,13 +179,13 @@ interface @beta Efl.Gfx.Image
scale: double; [[The scale factor. The default value is $[1.0].]]
}
}
@property border_center_fill {
@property center_fill_mode {
[[Specifies how the center part of the object (not the borders)
should be drawn when EFL is rendering it.
This function sets how the center part of the image object's
source image is to be drawn, which must be one of the values
in @Efl.Gfx.Border_Fill_Mode. By center we mean the complementary
in @Efl.Gfx.Center_Fill_Mode. By center we mean the complementary
part of that defined by @.border.set. This is very useful for
making frames and decorations. You would most probably also be
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
set {}
get {}
values {
fill: Efl.Gfx.Border_Fill_Mode; [[Fill mode of the center region.
The default value is @Efl.Gfx.Border_Fill_Mode.default, i.e. render
fill: Efl.Gfx.Center_Fill_Mode; [[Fill mode of the center region.
The default value is @Efl.Gfx.Center_Fill_Mode.default, i.e. render
and scale the center area, respecting its transparency.]]
}
}
@ -205,7 +205,7 @@ interface @beta Efl.Gfx.Image
once and then destroy them. When the regions are retrieved by the user,
it is his responsibility to destroy the iterators.. It will remember the
information for the lifetime of the object. It will ignore all value
of @.border, @.border_scale and @.border_center_fill . To reset the object
of @.border, @.border_scale and @.center_fill_mode . To reset the object
you can just pass $null to both horizontal and vertical at the same
time.
]]

2
src/lib/efl/interfaces/efl_gfx_types.eot
View File

@ -152,7 +152,7 @@ enum @beta Efl.Gfx.Vg_Composite_Method
mask_difference
}
enum @beta Efl.Gfx.Border_Fill_Mode
enum @beta Efl.Gfx.Center_Fill_Mode
{
[[How an image's center region (the complement to the border region) should be rendered by EFL]]
none = 0, [[Image's center region is $not to be rendered]]

2
src/lib/evas/canvas/efl_canvas_image_internal.eo
View File

@ -17,7 +17,7 @@ abstract @beta Efl.Canvas.Image_Internal extends Efl.Canvas.Object implements Ef
Efl.Gfx.Image.content_region { get; }
Efl.Gfx.Image.border { get; set; }
Efl.Gfx.Image.border_scale { get; set; }
Efl.Gfx.Image.border_center_fill { get; set; }
Efl.Gfx.Image.center_fill_mode { get; set; }
Efl.Gfx.Image.stretch_region { get; set; }
Efl.Gfx.Image.scale_hint { get; set; }
Efl.Gfx.Image.content_hint { get; set; }

4
src/lib/evas/canvas/evas_image_legacy.c
View File

@ -145,14 +145,14 @@ EAPI void
evas_object_image_border_center_fill_set(Evas_Object *obj, Evas_Border_Fill_Mode fill)
{
EVAS_IMAGE_API(obj);
efl_gfx_image_border_center_fill_set(obj, (Efl_Gfx_Border_Fill_Mode) fill);
efl_gfx_image_center_fill_mode_set(obj, (Efl_Gfx_Center_Fill_Mode) fill);
}
EAPI Evas_Border_Fill_Mode
evas_object_image_border_center_fill_get(const Evas_Object *obj)
{
EVAS_IMAGE_API(obj, EVAS_BORDER_FILL_NONE);
return (Evas_Border_Fill_Mode) efl_gfx_image_border_center_fill_get(obj);
return (Evas_Border_Fill_Mode) efl_gfx_image_center_fill_mode_get(obj);
}
EAPI void

8
src/lib/evas/canvas/evas_object_image.c
View File

@ -626,7 +626,7 @@ _efl_canvas_image_internal_efl_gfx_image_border_get(const Eo *eo_obj EINA_UNUSED
}
EOLIAN static void
_efl_canvas_image_internal_efl_gfx_image_border_center_fill_set(Eo *eo_obj, Evas_Image_Data *o, Efl_Gfx_Border_Fill_Mode _fill)
_efl_canvas_image_internal_efl_gfx_image_center_fill_mode_set(Eo *eo_obj, Evas_Image_Data *o, Efl_Gfx_Center_Fill_Mode _fill)
{
Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
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
evas_object_change(eo_obj, obj);
}
EOLIAN static Efl_Gfx_Border_Fill_Mode
_efl_canvas_image_internal_efl_gfx_image_border_center_fill_get(const Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o)
EOLIAN static Efl_Gfx_Center_Fill_Mode
_efl_canvas_image_internal_efl_gfx_image_center_fill_mode_get(const Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o)
{
return (Efl_Gfx_Border_Fill_Mode)o->cur->border.fill;
return (Efl_Gfx_Center_Fill_Mode)o->cur->border.fill;
}
static void