enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

dont use shadow lua obj w,h as it means text objects dont force their 

size right and u need extra calls to get them. fix.



SVN revision: 64793
This commit is contained in:
Carsten Haitzler 2011-11-06 04:44:13 +00:00
parent dc908c3c0b
commit 192139c55e
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
legacy/edje/src/lib/edje_lua2.c
View File

@ -59,7 +59,7 @@ struct _Edje_Lua_Evas_Object
{
Edje_Lua_Obj obj;
Evas_Object *evas_obj;
int x, y, w, h;
int x, y;
};
@ -1412,21 +1412,22 @@ _elua_resize(lua_State *L)
{
Edje_Lua_Obj *obj = (Edje_Lua_Obj *)lua_touserdata(L, 1);
Edje_Lua_Evas_Object *elo = (Edje_Lua_Evas_Object *)obj;
Evas_Coord ow, oh;
int w, h;
if (!obj) return 0;
if (!obj->is_evas_obj) return 0;
evas_object_geometry_get(elo->evas_obj, NULL, NULL, &ow, &oh);
if (_elua_2_int_get(L, 2, EINA_TRUE, "w", &w, "h", &h) > 0)
{
if ((w != elo->w) || (h != elo->h))
if ((w != ow) || (h != oh))
{
elo->w = w;
elo->h = h;
evas_object_resize(elo->evas_obj, elo->w, elo->h);
evas_object_resize(elo->evas_obj, w, h);
evas_object_geometry_get(elo->evas_obj, NULL, NULL, &ow, &oh);
}
}
_elua_int_ret(L, "w", elo->w);
_elua_int_ret(L, "h", elo->h);
_elua_int_ret(L, "w", ow);
_elua_int_ret(L, "h", oh);
return 1;
}
@ -1447,10 +1448,12 @@ _elua_geom(lua_State *L)
{
Edje_Lua_Obj *obj = (Edje_Lua_Obj *)lua_touserdata(L, 1);
Edje_Lua_Evas_Object *elo = (Edje_Lua_Evas_Object *)obj;
Evas_Coord ow, oh;
int x, y, w, h;
if (!obj) return 0;
if (!obj->is_evas_obj) return 0;
evas_object_geometry_get(elo->evas_obj, NULL, NULL, &ow, &oh);
if (_elua_4_int_get(L, 2, EINA_TRUE, "x", &x, "y", &y, "w", &w, "h", &h) > 0)
{
if ((x != elo->x) || (y != elo->y))
@ -1461,17 +1464,16 @@ _elua_geom(lua_State *L)
obj->ed->x + elo->x,
obj->ed->y + elo->y);
}
if ((w != elo->w) || (h != elo->h))
if ((w != ow) || (h != oh))
{
elo->w = w;
elo->h = h;
evas_object_resize(elo->evas_obj, elo->w, elo->h);
evas_object_resize(elo->evas_obj, w, h);
evas_object_geometry_get(elo->evas_obj, NULL, NULL, &ow, &oh);
}
}
_elua_int_ret(L, "x", elo->x);
_elua_int_ret(L, "y", elo->y);
_elua_int_ret(L, "w", elo->w);
_elua_int_ret(L, "h", elo->h);
_elua_int_ret(L, "w", ow);
_elua_int_ret(L, "h", oh);
return 1;
}