summaryrefslogtreecommitdiff
path: root/src/lib/edje
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-09-13 17:41:20 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-13 18:09:19 +0900
commit89733b22f6287f0c9126acc93a2b1dae590ae4dd (patch)
tree557083c042dae7d3bfecc403bc28dbeee64de94f /src/lib/edje
parent83ea35541ceea5583528b09daf397deecb354b97 (diff)
efl_gfx_fill: Use Eina.Rectangle for fill (EO)
Diffstat (limited to 'src/lib/edje')
-rw-r--r--src/lib/edje/edje_calc.c4
-rw-r--r--src/lib/edje/edje_private.h4
2 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 8c811478b7..9bdedcaa0b 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -3616,7 +3616,7 @@ _edje_proxy_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj
3616 } 3616 }
3617 } 3617 }
3618 3618
3619 efl_gfx_fill_set(ep->object, p3->type.common->fill.x, p3->type.common->fill.y, p3->type.common->fill.w, p3->type.common->fill.h); 3619 efl_gfx_fill_set(ep->object, p3->type.common->fill);
3620 efl_image_smooth_scale_set(ep->object, p3->smooth); 3620 efl_image_smooth_scale_set(ep->object, p3->smooth);
3621 evas_object_image_source_visible_set(ep->object, chosen_desc->proxy.source_visible); 3621 evas_object_image_source_visible_set(ep->object, chosen_desc->proxy.source_visible);
3622 evas_object_image_source_clip_set(ep->object, chosen_desc->proxy.source_clip); 3622 evas_object_image_source_clip_set(ep->object, chosen_desc->proxy.source_clip);
@@ -3656,7 +3656,7 @@ _edje_image_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj
3656 set->entry->border.scale_by : p3->type.common->spec.image.border_scale_by; 3656 set->entry->border.scale_by : p3->type.common->spec.image.border_scale_by;
3657 } 3657 }
3658 3658
3659 efl_gfx_fill_set(ep->object, p3->type.common->fill.x, p3->type.common->fill.y, p3->type.common->fill.w, p3->type.common->fill.h); 3659 efl_gfx_fill_set(ep->object, p3->type.common->fill);
3660 efl_image_smooth_scale_set(ep->object, p3->smooth); 3660 efl_image_smooth_scale_set(ep->object, p3->smooth);
3661 if (chosen_desc->image.border.scale) 3661 if (chosen_desc->image.border.scale)
3662 { 3662 {
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index b98e02af13..f0e7f00252 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -1844,9 +1844,7 @@ typedef struct _Edje_Calc_Params_Type_Node Edje_Calc_Params_Type_Node;
1844 1844
1845struct _Edje_Calc_Params_Type_Common 1845struct _Edje_Calc_Params_Type_Common
1846{ 1846{
1847 struct { 1847 Eina_Rectangle fill; // 16
1848 int x, y, w, h; // 16
1849 } fill; // 16
1850 union { 1848 union {
1851 struct { 1849 struct {
1852 unsigned short l, r, t, b; // 8 1850 unsigned short l, r, t, b; // 8