forked from enlightenment/efl
wtf? why add a resize callback? the FRAME will resize the child, not the
child just resize itself. this broke scale inheritance. the resize code ASSUMES the child is an edje object - not a smart object or anything else. removed. SVN revision: 43290
This commit is contained in:
parent
959022991c
commit
89dc11e1a0
|
@ -60,15 +60,6 @@ _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
|||
_sizing_eval(data);
|
||||
}
|
||||
|
||||
static void
|
||||
_content_resize(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(data);
|
||||
Evas_Coord minw, minh;
|
||||
edje_object_size_min_calc(wd->content, &minw, &minh);
|
||||
evas_object_size_hint_min_set(wd->content, minw, minh);
|
||||
}
|
||||
|
||||
static void
|
||||
_sub_del(void *data, Evas_Object *obj, void *event_info)
|
||||
{
|
||||
|
@ -78,9 +69,7 @@ _sub_del(void *data, Evas_Object *obj, void *event_info)
|
|||
if (sub == wd->content)
|
||||
{
|
||||
evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
|
||||
_changed_size_hints, obj);
|
||||
evas_object_event_callback_del_full(sub, EVAS_CALLBACK_RESIZE,
|
||||
_content_resize, obj);
|
||||
_changed_size_hints, obj);
|
||||
wd->content = NULL;
|
||||
_sizing_eval(obj);
|
||||
}
|
||||
|
@ -178,9 +167,6 @@ elm_frame_content_set(Evas_Object *obj, Evas_Object *content)
|
|||
evas_object_event_callback_add(content,
|
||||
EVAS_CALLBACK_CHANGED_SIZE_HINTS,
|
||||
_changed_size_hints, obj);
|
||||
evas_object_event_callback_add(content,
|
||||
EVAS_CALLBACK_RESIZE,
|
||||
_content_resize, obj);
|
||||
_sizing_eval(obj);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue