summaryrefslogtreecommitdiff
path: root/src/lib/edje
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-09-18 16:22:01 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-18 16:33:33 +0900
commita72f3ec64ec8dfc20c68e1b471a6374a04058f8b (patch)
treea034aff82d8f21f10aa3eaa7ddbce58c9ac92c39 /src/lib/edje
parent7d2b4b69166c0f2abaf0f0bdec3b0d04eb721517 (diff)
efl: Use Eina.Size2D for size hint combined min
For this patch I decided to add a pseudo legacy wrapper as the function is called in a very large number of places. Fixing all those calls to use the size2d form is a lot of work and a greater risk of b0rking something.
Diffstat (limited to 'src/lib/edje')
-rw-r--r--src/lib/edje/edje_box_layout.c2
-rw-r--r--src/lib/edje/edje_lua.c2
-rw-r--r--src/lib/edje/edje_util.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/edje/edje_box_layout.c b/src/lib/edje/edje_box_layout.c
index 1abfbc99f7..8eb73bb071 100644
--- a/src/lib/edje/edje_box_layout.c
+++ b/src/lib/edje/edje_box_layout.c
@@ -212,7 +212,7 @@ _edje_box_recalc_apply(Edje *ed EINA_UNUSED, Edje_Real_Part *ep, Edje_Calc_Param
212 evas_object_smart_calculate(ep->object); 212 evas_object_smart_calculate(ep->object);
213 } 213 }
214#if 0 /* Why the hell do we affect part size after resize ??? */ 214#if 0 /* Why the hell do we affect part size after resize ??? */
215 efl_gfx_size_hint_combined_min_get(ep->object, &min_w, &min_h); 215 evas_object_size_hint_combined_min_get(ep->object, &min_w, &min_h);
216 if (chosen_desc->box.min.h && (p3->w < min_w)) 216 if (chosen_desc->box.min.h && (p3->w < min_w))
217 p3->w = min_w; 217 p3->w = min_w;
218 if (chosen_desc->box.min.v && (p3->h < min_h)) 218 if (chosen_desc->box.min.v && (p3->h < min_h))
diff --git a/src/lib/edje/edje_lua.c b/src/lib/edje/edje_lua.c
index f5bef3326f..9af93cc3ea 100644
--- a/src/lib/edje/edje_lua.c
+++ b/src/lib/edje/edje_lua.c
@@ -1424,7 +1424,7 @@ _edje_lua_object_get_size_hint_min(lua_State *L)
1424{ 1424{
1425 Edje_Lua_Evas_Object *obj = _edje_lua_checkudata(L, 1, &mObject); 1425 Edje_Lua_Evas_Object *obj = _edje_lua_checkudata(L, 1, &mObject);
1426 int w, h; 1426 int w, h;
1427 efl_gfx_size_hint_combined_min_get(obj->eo, &w, &h); 1427 evas_object_size_hint_combined_min_get(obj->eo, &w, &h);
1428 lua_createtable(L, 2, 0); 1428 lua_createtable(L, 2, 0);
1429 lua_pushnumber(L, w); 1429 lua_pushnumber(L, w);
1430 lua_rawseti(L, -2, 1); 1430 lua_rawseti(L, -2, 1);
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 9b3d622b2f..5bf0326d86 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -5507,7 +5507,7 @@ _edje_real_part_swallow_hints_update(Edje_Real_Part *rp)
5507 Evas_Coord w1 = 0, h1 = 0, w2 = 0, h2 = 0, aw = 0, ah = 0; 5507 Evas_Coord w1 = 0, h1 = 0, w2 = 0, h2 = 0, aw = 0, ah = 0;
5508 Evas_Aspect_Control am = EVAS_ASPECT_CONTROL_NONE; 5508 Evas_Aspect_Control am = EVAS_ASPECT_CONTROL_NONE;
5509 5509
5510 efl_gfx_size_hint_combined_min_get(rp->typedata.swallow->swallowed_object, &w1, &h1); 5510 evas_object_size_hint_combined_min_get(rp->typedata.swallow->swallowed_object, &w1, &h1);
5511 evas_object_size_hint_max_get(rp->typedata.swallow->swallowed_object, &w2, &h2); 5511 evas_object_size_hint_max_get(rp->typedata.swallow->swallowed_object, &w2, &h2);
5512 evas_object_size_hint_aspect_get(rp->typedata.swallow->swallowed_object, &am, &aw, &ah); 5512 evas_object_size_hint_aspect_get(rp->typedata.swallow->swallowed_object, &am, &aw, &ah);
5513 rp->typedata.swallow->swallow_params.min.w = w1; 5513 rp->typedata.swallow->swallow_params.min.w = w1;