forked from enlightenment/efl
Revert "elm test: image - use table to align image swallowed in layout"
This reverts commit a4e37b61f9
.
This commit is contained in:
parent
5a922f4afa
commit
a8b1fc6bd0
|
@ -81,68 +81,28 @@ test_image(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
|
|||
evas_object_show(win);
|
||||
}
|
||||
|
||||
typedef struct _min_size_obj
|
||||
{
|
||||
Evas_Object *tb, *rect;
|
||||
} min_size_obj;
|
||||
|
||||
static void
|
||||
im_align_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
|
||||
{
|
||||
double h,v;
|
||||
Evas_Object *win = data;
|
||||
Evas_Object *im = evas_object_data_get(win, "im");
|
||||
Evas_Object *h_sl = evas_object_data_get(win, "h_sl");
|
||||
Evas_Object *v_sl = evas_object_data_get(win, "v_sl");
|
||||
min_size_obj *mso = evas_object_data_get(win, "mso");
|
||||
|
||||
h = elm_slider_value_get(h_sl);
|
||||
v = elm_slider_value_get(v_sl);
|
||||
|
||||
elm_table_align_set(mso->tb, h, v);
|
||||
evas_object_size_hint_align_set(im, h, v);
|
||||
evas_object_size_hint_align_get(im, &h, &v);
|
||||
printf("align %.3f %.3f\n", h, v);
|
||||
}
|
||||
|
||||
static min_size_obj *
|
||||
_min_size_obj_set(Evas_Object *obj, Evas_Object *pack_obj, int w, int h)
|
||||
{
|
||||
Evas_Object *tb, *rect;
|
||||
min_size_obj *mso = malloc(sizeof(min_size_obj));
|
||||
|
||||
tb = elm_table_add(obj);
|
||||
|
||||
rect = evas_object_rectangle_add(evas_object_evas_get(tb));
|
||||
evas_object_size_hint_min_set(rect, w, h);
|
||||
evas_object_size_hint_max_set(rect, w, h);
|
||||
evas_object_color_set(rect, 0, 0, 0, 0);
|
||||
evas_object_size_hint_align_set(rect, EVAS_HINT_FILL,
|
||||
EVAS_HINT_FILL);
|
||||
evas_object_size_hint_weight_set(rect, EVAS_HINT_EXPAND,
|
||||
EVAS_HINT_EXPAND);
|
||||
elm_table_pack(tb, rect, 0, 0, 1, 1);
|
||||
elm_table_pack(tb, pack_obj, 0, 0, 1, 1);
|
||||
evas_object_show(rect);
|
||||
evas_object_show(tb);
|
||||
|
||||
mso->rect = rect;
|
||||
mso->tb = tb;
|
||||
|
||||
return mso;
|
||||
}
|
||||
|
||||
static void
|
||||
_cleanup_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
|
||||
{
|
||||
min_size_obj *mso = data;
|
||||
|
||||
free(mso);
|
||||
}
|
||||
|
||||
void
|
||||
test_image_swallow_align(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
|
||||
{
|
||||
Evas_Object *win, *box, *im, *ly, *sl;
|
||||
char buf[PATH_MAX];
|
||||
min_size_obj *mso;
|
||||
|
||||
win = elm_win_util_standard_add("image align", "Test Align Inside Layout");
|
||||
elm_win_autodel_set(win, EINA_TRUE);
|
||||
|
@ -165,11 +125,9 @@ test_image_swallow_align(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
|
|||
elm_image_file_set(im, buf, NULL);
|
||||
evas_object_size_hint_weight_set(im, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_size_hint_align_set(im, EVAS_HINT_FILL, EVAS_HINT_FILL);
|
||||
elm_layout_content_set(ly, "swallow", im);
|
||||
evas_object_show(im);
|
||||
|
||||
mso = _min_size_obj_set(win, im, 50, 50);
|
||||
elm_layout_content_set(ly, "swallow", mso->tb);
|
||||
evas_object_data_set(win, "mso", mso);
|
||||
evas_object_data_set(win, "im", im);
|
||||
|
||||
sl = elm_slider_add(win);
|
||||
elm_slider_value_set(sl, 0.5);
|
||||
|
@ -193,7 +151,6 @@ test_image_swallow_align(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
|
|||
|
||||
evas_object_resize(win, 300, 600);
|
||||
evas_object_show(win);
|
||||
evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, mso);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
Loading…
Reference in New Issue