summaryrefslogtreecommitdiff
path: root/src/lib/edje/edje_smart.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-09-15 18:37:25 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-18 13:34:50 +0900
commit4c634ed78e0b298f916e4c79a7e222100d0085d2 (patch)
tree9fa8b385d3d8c2445ea94c839fdc38a30eb36f7d /src/lib/edje/edje_smart.c
parent8fb194d969ccb9227e56ea60f538d977393408d7 (diff)
efl: Use Eina.Size2D for Efl.Gfx.size
Big patch as a lot of things call or reimplement size_set. Hopefully I got it right... fingers crossed.
Diffstat (limited to 'src/lib/edje/edje_smart.c')
-rw-r--r--src/lib/edje/edje_smart.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index bd25e58..8f1c219 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -262,19 +262,19 @@ _edje_limit_get(Edje *ed, Edje_Limit **limits, unsigned int length, Evas_Coord s
262} 262}
263 263
264EOLIAN static void 264EOLIAN static void
265_edje_object_efl_gfx_size_set(Eo *obj, Edje *ed, Evas_Coord w, Evas_Coord h) 265_edje_object_efl_gfx_size_set(Eo *obj, Edje *ed, Eina_Size2D sz)
266{ 266{
267 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, w, h)) 267 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
268 return; 268 return;
269 269
270 if ((w == ed->w) && (h == ed->h)) goto super; 270 if ((sz.w == ed->w) && (sz.h == ed->h)) goto super;
271 if (ed->collection) 271 if (ed->collection)
272 { 272 {
273 _edje_limit_get(ed, ed->collection->limits.horizontal, ed->collection->limits.horizontal_count, ed->w, w); 273 _edje_limit_get(ed, ed->collection->limits.horizontal, ed->collection->limits.horizontal_count, ed->w, sz.w);
274 _edje_limit_get(ed, ed->collection->limits.vertical, ed->collection->limits.vertical_count, ed->h, h); 274 _edje_limit_get(ed, ed->collection->limits.vertical, ed->collection->limits.vertical_count, ed->h, sz.h);
275 } 275 }
276 ed->w = w; 276 ed->w = sz.w;
277 ed->h = h; 277 ed->h = sz.h;
278#ifdef HAVE_EPHYSICS 278#ifdef HAVE_EPHYSICS
279 if ((ed->collection) && (ed->world)) 279 if ((ed->collection) && (ed->world))
280 { 280 {
@@ -298,7 +298,7 @@ _edje_object_efl_gfx_size_set(Eo *obj, Edje *ed, Evas_Coord w, Evas_Coord h)
298 _edje_emit(ed, "resize", NULL); 298 _edje_emit(ed, "resize", NULL);
299 299
300super: 300super:
301 efl_gfx_size_set(efl_super(obj, MY_CLASS), w, h); 301 efl_gfx_size_set(efl_super(obj, MY_CLASS), sz);
302} 302}
303 303
304static void 304static void