void *event_info __UNUSED__);
static Elm_Ctxpopup_Direction _calc_base_geometry(Evas_Object *obj,
Evas_Coord_Rectangle *rect);
-static void _update_arrow(Evas_Object *obj, Elm_Ctxpopup_Direction dir);
+static void _update_arrow(Evas_Object *obj,
+ Elm_Ctxpopup_Direction dir,
+ Evas_Coord_Rectangle rect);
static void _sizing_eval(Evas_Object *obj);
static void _shift_base_by_arrow(Evas_Object *arrow,
Elm_Ctxpopup_Direction dir,
Evas *e,
Evas_Object *obj,
void *event_info);
+static void _content_resize(void *data,
+ Evas *e,
+ Evas_Object *obj,
+ void *event_info);
static void _scroller_resize(void *data,
Evas *e,
Evas_Object *obj,
}
static void
-_update_arrow(Evas_Object *obj, Elm_Ctxpopup_Direction dir)
+_update_arrow(Evas_Object *obj, Elm_Ctxpopup_Direction dir,
+ Evas_Coord_Rectangle base_size)
{
Evas_Coord x, y;
Evas_Coord_Rectangle arrow_size;
- Evas_Coord_Rectangle base_size;
Widget_Data *wd;
double drag;
evas_object_geometry_get(obj, &x, &y, NULL, NULL);
evas_object_geometry_get(wd->arrow, NULL, NULL, &arrow_size.w,
&arrow_size.h);
- evas_object_geometry_get(wd->base, &base_size.x, &base_size.y,
- &base_size.w, &base_size.h);
edje_object_part_unswallow(wd->base, wd->arrow);
if (!wd->horizontal && !wd->content)
_compress_item(obj);
- _update_arrow(obj, wd->dir);
+ _update_arrow(obj, wd->dir, rect);
_shift_base_by_arrow(wd->arrow, wd->dir, &rect);
//resize scroller according to final size.
evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_RESIZE,
_parent_resize, obj);
+ evas_object_event_callback_del_full(wd->box, EVAS_CALLBACK_RESIZE,
+ _content_resize, obj);
_parent_cut_off(obj);
}
Evas_Object *content)
{
ELM_CHECK_WIDTYPE(obj, widtype);
+ Evas_Coord min_w = -1, min_h = -1;
Widget_Data *wd;
if (wd->items) elm_ctxpopup_clear(obj);
if (wd->content) evas_object_del(wd->content);
- evas_object_event_callback_add(content, EVAS_CALLBACK_DEL, _content_del,
- obj);
+ //Use Box
+ 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);
- edje_object_part_swallow(wd->base, "elm.swallow.content", content);
- edje_object_message_signal_process(wd->base);
+ evas_object_event_callback_add(wd->box, EVAS_CALLBACK_RESIZE,
+ _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->dir = ELM_CTXPOPUP_DIRECTION_UNKNOWN;
if (wd->visible)
_sizing_eval(obj);
if (!wd) return NULL;
content = wd->content;
- if (!content) return NULL;
+ if (!content || !wd->box) return NULL;
- edje_object_part_unswallow(wd->base, content);
- elm_widget_sub_object_del(obj, content);
- evas_object_event_callback_del(content, EVAS_CALLBACK_DEL, _content_del);
+ edje_object_part_unswallow(wd->base, wd->box);
+ elm_widget_sub_object_del(obj, wd->box);
+ evas_object_event_callback_del(wd->box, EVAS_CALLBACK_DEL, _content_del);
edje_object_signal_emit(wd->base, "elm,state,content,disable", "elm");
+ evas_object_del(wd->box);
+ wd->box = NULL;
wd->content = NULL;
+ wd->dir = ELM_CTXPOPUP_DIRECTION_UNKNOWN;
return content;
-
}
static Evas_Object *
}
static void
+_content_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
+ void *event_info __UNUSED__)
+{
+ Widget_Data *wd = elm_widget_data_get(data);
+ if (!wd) return;
+ elm_box_recalculate(wd->box);
+ _sizing_eval(data);
+}
+
+static void
_scroller_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj,
void *event_info __UNUSED__)
{