summaryrefslogtreecommitdiff
path: root/src/lib/edje/edje_calc.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-09-14 11:59:44 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-18 13:22:52 +0900
commitf3eff6eb3ee6e9b56c0be5cd7f8905f14b388e4f (patch)
tree473b3d1b3e56cc5875d4496bf40fe8279165e132 /src/lib/edje/edje_calc.c
parentcb3b4cc8d7794bea575a85325c8a58f25f0507b2 (diff)
efl: Introduce Eina.Rect and switch EO APIs to it
It's a complex struct but defined in EO as a simple struct. ABI-wise it's equivalent to Eina_Rectangle. Some macros that use Eina_Rectangle also work on Eina_Rect out of the box, most of the code dealing with x,y,w,h will require no modifications either. But Eina_Rect provides direct access to a size or position 2d component, as well as the usual x,y,w,h. The field "rect" is provided as a convenience for code dealing with both Eina_Rectangle and Eina_Rect. We may or may not require it. Note: Size2D could use unsigned values but I have spotted a few places in the code that actually use -1 to indicate invalid size (as opposed to 0x0). @feature
Diffstat (limited to '')
-rw-r--r--src/lib/edje/edje_calc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 9bdedcaa0b..54aca19613 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); 3619 efl_gfx_fill_set(ep->object, (Eina_Rect) 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); 3659 efl_gfx_fill_set(ep->object, (Eina_Rect) 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 {