dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efl: updated efl_gfx_shape_dup() implementation to use direct access to internal data. 

As I don't see the use of inheritance for stroke anymore, we will use internal access
rather than inherited get/set function. This behavior can be reverted if anyone find
a real use case for it.

Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
This commit is contained in:
Subhransu Mohanty 2015-11-18 15:27:59 +09:00 committed by Cedric BAIL
parent 71b2efe94d
commit e79dd4c161
1 changed files with 29 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/lib/efl/interfaces/efl_gfx_shape.c
View File

@ -433,51 +433,6 @@ _efl_gfx_shape_equal_commands(Eo *obj EINA_UNUSED,
return _efl_gfx_shape_equal_commands_internal(with_pd, pd);
}
static void
_efl_gfx_shape_dup(Eo *obj, Efl_Gfx_Shape_Data *pd, const Eo *dup_from)
{
const Efl_Gfx_Dash *dash = NULL;
Efl_Gfx_Shape_Data *from;
Efl_Gfx_Fill_Rule fill_rule;
unsigned int dash_length = 0;
Efl_Gfx_Cap cap;
Efl_Gfx_Join j;
int sr, sg, sb, sa;
double scale, location;
double sw;
if (obj == dup_from) return ;
from = eo_data_scope_get(dup_from, EFL_GFX_SHAPE_MIXIN);
if (!from) return ;
eo_do(dup_from,
scale = efl_gfx_shape_stroke_scale_get(),
efl_gfx_shape_stroke_color_get(&sr, &sg, &sb, &sa),
sw = efl_gfx_shape_stroke_width_get(),
location = efl_gfx_shape_stroke_location_get(),
efl_gfx_shape_stroke_dash_get(&dash, &dash_length),
cap = efl_gfx_shape_stroke_cap_get(),
j = efl_gfx_shape_stroke_join_get(),
fill_rule = efl_gfx_shape_fill_rule_get());
eo_do(obj,
efl_gfx_shape_stroke_scale_set(scale),
efl_gfx_shape_stroke_color_set(sr, sg, sb, sa),
efl_gfx_shape_stroke_width_set(sw),
efl_gfx_shape_stroke_location_set(location),
efl_gfx_shape_stroke_dash_set(dash, dash_length),
efl_gfx_shape_stroke_cap_set(cap),
efl_gfx_shape_stroke_join_set(j),
efl_gfx_shape_fill_rule_set(fill_rule));
_efl_gfx_shape_path_set(obj, pd, from->commands, from->points);
pd->convex = from->convex;
eo_do(obj,
eo_event_callback_call(EFL_GFX_PATH_CHANGED, NULL),
eo_event_callback_call(EFL_GFX_CHANGED, NULL));
}
static void
_efl_gfx_shape_reset(Eo *obj, Efl_Gfx_Shape_Data *pd)
{
@ -1836,4 +1791,33 @@ _efl_gfx_shape_fill_rule_get(Eo *obj EINA_UNUSED,
return pd->fill_rule;
}
static void
_efl_gfx_shape_dup(Eo *obj, Efl_Gfx_Shape_Data *pd, const Eo *dup_from)
{
Efl_Gfx_Shape_Data *from;
if (obj == dup_from) return ;
from = eo_data_scope_get(dup_from, EFL_GFX_SHAPE_MIXIN);
if (!from) return ;
pd->public.stroke.scale = from->public.stroke.scale;
pd->public.stroke.width = from->public.stroke.width;
pd->public.stroke.centered = from->public.stroke.centered;
pd->public.stroke.cap = from->public.stroke.cap;
pd->public.stroke.join = from->public.stroke.join;
pd->public.stroke.color.r = from->public.stroke.color.r;
pd->public.stroke.color.g = from->public.stroke.color.g;
pd->public.stroke.color.b = from->public.stroke.color.b;
pd->public.stroke.color.a = from->public.stroke.color.a;
pd->fill_rule = from->fill_rule;
pd->convex = from->convex;
_efl_gfx_shape_stroke_dash_set(obj, pd, from->public.stroke.dash, from->public.stroke.dash_length);
_efl_gfx_shape_path_set(obj, pd, from->commands, from->points);
eo_do(obj,
eo_event_callback_call(EFL_GFX_PATH_CHANGED, NULL),
eo_event_callback_call(EFL_GFX_CHANGED, NULL));
}
#include "interfaces/efl_gfx_shape.eo.c"