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

elementary/ctxpopup 

Hey dear, here is the second patch using the box for the ctxpopup's
content.
The wd->content is content which is set by
elm_object_content_set(ctxpopup, content) not the box.
Please check this and give any feedbacks, Thanks. :-)

Signed-Off-By: Kim Shinwoo <kimcinoo.efl@gmail.com>
Signed-Off-By: ChunEon Park <hermet@hermet.pe.kr>



SVN revision: 66268
This commit is contained in:
Kim Shinwoo 2011-12-16 05:27:11 +00:00 committed by ChunEon Park
parent f4e4ad9148
commit c9a380b88b
1 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
legacy/elementary/src/lib/elc_ctxpopup.c
View File

@ -105,6 +105,10 @@ static void _ctxpopup_hide(void *data,
Evas *e, Evas *e,
Evas_Object *obj, Evas_Object *obj,
void *event_info); void *event_info);
static void _content_resize(void *data,
Evas *e,
Evas_Object *obj,
void *event_info);
static void _scroller_resize(void *data, static void _scroller_resize(void *data,
Evas *e, Evas *e,
Evas_Object *obj, Evas_Object *obj,
@ -805,6 +809,7 @@ _content_set_hook(Evas_Object *obj, const char *part,
Evas_Object *content) Evas_Object *content)
{ {
ELM_CHECK_WIDTYPE(obj, widtype); ELM_CHECK_WIDTYPE(obj, widtype);
Evas_Coord min_w = -1, min_h = -1;
Widget_Data *wd; Widget_Data *wd;
@ -816,14 +821,28 @@ _content_set_hook(Evas_Object *obj, const char *part,
if (wd->items) elm_ctxpopup_clear(obj); if (wd->items) elm_ctxpopup_clear(obj);
if (wd->content) evas_object_del(wd->content); if (wd->content) evas_object_del(wd->content);
evas_object_event_callback_add(content, EVAS_CALLBACK_DEL, _content_del, //Use Box
obj); wd->box = elm_box_add(obj);
evas_object_size_hint_weight_set(wd->box, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
evas_object_size_hint_weight_set(content, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
evas_object_size_hint_fill_set(content, EVAS_HINT_FILL,
EVAS_HINT_FILL);
evas_object_show(content);
evas_object_size_hint_min_get(content, &min_w, &min_h);
evas_object_size_hint_min_set(wd->box, min_w, min_h);
elm_box_pack_end(wd->box, content);
elm_widget_sub_object_add(obj, content); evas_object_event_callback_add(wd->box, EVAS_CALLBACK_RESIZE,
edje_object_part_swallow(wd->base, "elm.swallow.content", content); _content_resize, obj);
evas_object_event_callback_add(wd->box, EVAS_CALLBACK_DEL,
_content_del, obj);
elm_widget_sub_object_add(obj, wd->box);
edje_object_part_swallow(wd->base, "elm.swallow.content", wd->box);
wd->content = content; wd->content = content;
wd->dir = ELM_CTXPOPUP_DIRECTION_UNKNOWN; wd->dir = ELM_CTXPOPUP_DIRECTION_UNKNOWN;
if (wd->visible) if (wd->visible)
@ -842,18 +861,19 @@ _content_unset_hook(Evas_Object *obj, const char *part)
if (!wd) return NULL; if (!wd) return NULL;
content = wd->content; content = wd->content;
if (!content) return NULL; if (!content || !wd->box) return NULL;
edje_object_part_unswallow(wd->base, content); edje_object_part_unswallow(wd->base, wd->box);
elm_widget_sub_object_del(obj, content); elm_widget_sub_object_del(obj, wd->box);
evas_object_event_callback_del(content, EVAS_CALLBACK_DEL, _content_del); evas_object_event_callback_del(wd->box, EVAS_CALLBACK_DEL, _content_del);
edje_object_signal_emit(wd->base, "elm,state,content,disable", "elm"); edje_object_signal_emit(wd->base, "elm,state,content,disable", "elm");
evas_object_del(wd->box);
wd->box = NULL;
wd->content = NULL; wd->content = NULL;
wd->dir = ELM_CTXPOPUP_DIRECTION_UNKNOWN; wd->dir = ELM_CTXPOPUP_DIRECTION_UNKNOWN;
return content; return content;
} }
static Evas_Object * static Evas_Object *
@ -1023,6 +1043,19 @@ _ctxpopup_hide(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj,
_hide(obj); _hide(obj);
} }
static void
_content_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
Widget_Data *wd;
wd = elm_widget_data_get(data);
if (!wd) return;
elm_box_recalculate(wd->box);
_sizing_eval(data);
}
static void static void
_scroller_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj, _scroller_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj,
void *event_info __UNUSED__) void *event_info __UNUSED__)