dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* elementary: Remove work around edje bug. 

SVN revision: 43417
This commit is contained in:
Cedric BAIL 2009-11-02 10:21:52 +00:00
parent 8da22b8178
commit 4723717a79
2 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
legacy/elementary/src/lib/elm_index.c
View File

@ -127,17 +127,9 @@ _theme_hook(Evas_Object *obj)
edje_object_scale_set(wd->base, elm_widget_scale_get(obj) * _elm_config->scale);
_sizing_eval(obj);
_index_box_auto_fill(obj, wd->bx[0], 0);
// FIXME: for some reason size hint changes are not picked up by edje!
edje_object_part_swallow(wd->base, "elm.swallow.index.0", wd->bx[0]);
if (wd->active)
{
if (wd->level == 1)
{
_index_box_auto_fill(obj, wd->bx[1], 1);
// FIXME: for some reason size hint changes are not picked up by edje!
edje_object_part_swallow(wd->base, "elm.swallow.index.1", wd->bx[1]);
}
}
if (wd->level == 1)
_index_box_auto_fill(obj, wd->bx[1], 1);
}
static void
@ -575,8 +567,6 @@ elm_index_active_set(Evas_Object *obj, Eina_Bool active)
{
_index_box_clear(obj, wd->bx[1], 1);
_index_box_auto_fill(obj, wd->bx[0], 0);
// FIXME: for some reason size hint changes are not picked up by edje!
edje_object_part_swallow(wd->base, "elm.swallow.index.0", wd->bx[0]);
edje_object_signal_emit(wd->base, "elm,state,active", "elm");
}
else
@ -812,12 +802,6 @@ elm_index_item_go(Evas_Object *obj, int level)
if (!wd) return;
_index_box_auto_fill(obj, wd->bx[0], 0);
// FIXME: for some reason size hint changes are not picked up by edje!
edje_object_part_swallow(wd->base, "elm.swallow.index.0", wd->bx[0]);
if (wd->level == 1)
{
_index_box_auto_fill(obj, wd->bx[1], 1);
// FIXME: for some reason size hint changes are not picked up by edje!
edje_object_part_swallow(wd->base, "elm.swallow.index.1", wd->bx[1]);
}
_index_box_auto_fill(obj, wd->bx[1], 1);
}

16
legacy/elementary/src/lib/elm_layout.c
View File

@ -69,21 +69,7 @@ _sizing_eval(Evas_Object *obj)
static void
_changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Widget_Data *wd = elm_widget_data_get(data);
const Eina_List *l;
const Subinfo *si;
// FIXME: for some reason size hint changes are not picked up by edje!
EINA_LIST_FOREACH(wd->subs, l, si)
{
if (si->obj == obj)
{
edje_object_part_swallow(wd->lay, si->swallow, obj);
_sizing_eval(data);
break;
}
}
//_sizing_eval(data);
_sizing_eval(data);
}
static void