forked from enlightenment/ephoto
Ephoto: Make sure to del evas_object_rect.
This commit is contained in:
parent
f8b9b7e820
commit
1fcf1783a0
|
@ -16,6 +16,7 @@ struct _Ephoto_Single_Browser
|
||||||
Evas_Object *viewer;
|
Evas_Object *viewer;
|
||||||
Evas_Object *infolabel;
|
Evas_Object *infolabel;
|
||||||
Evas_Object *nolabel;
|
Evas_Object *nolabel;
|
||||||
|
Evas_Object *botbox;
|
||||||
const char *pending_path;
|
const char *pending_path;
|
||||||
Ephoto_Entry *entry;
|
Ephoto_Entry *entry;
|
||||||
Ephoto_Orient orient;
|
Ephoto_Orient orient;
|
||||||
|
@ -501,6 +502,8 @@ _ephoto_single_browser_recalc(Ephoto_Single_Browser *sb)
|
||||||
{
|
{
|
||||||
evas_object_del(sb->viewer);
|
evas_object_del(sb->viewer);
|
||||||
sb->viewer = NULL;
|
sb->viewer = NULL;
|
||||||
|
evas_object_del(sb->botbox);
|
||||||
|
sb->botbox = NULL;
|
||||||
evas_object_del(sb->infolabel);
|
evas_object_del(sb->infolabel);
|
||||||
sb->infolabel = NULL;
|
sb->infolabel = NULL;
|
||||||
}
|
}
|
||||||
|
@ -520,7 +523,6 @@ _ephoto_single_browser_recalc(Ephoto_Single_Browser *sb)
|
||||||
{
|
{
|
||||||
char image_info[PATH_MAX];
|
char image_info[PATH_MAX];
|
||||||
Evas_Coord w, h;
|
Evas_Coord w, h;
|
||||||
Evas_Object *botbox;
|
|
||||||
Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer");
|
Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer");
|
||||||
|
|
||||||
evas_object_image_size_get(elm_image_object_get(v->image), &w, &h);
|
evas_object_image_size_get(elm_image_object_get(v->image), &w, &h);
|
||||||
|
@ -534,13 +536,13 @@ _ephoto_single_browser_recalc(Ephoto_Single_Browser *sb)
|
||||||
evas_object_event_callback_add
|
evas_object_event_callback_add
|
||||||
(sb->viewer, EVAS_CALLBACK_MOUSE_WHEEL, _mouse_wheel, sb);
|
(sb->viewer, EVAS_CALLBACK_MOUSE_WHEEL, _mouse_wheel, sb);
|
||||||
|
|
||||||
botbox = evas_object_rectangle_add(evas_object_evas_get(sb->table));
|
sb->botbox = evas_object_rectangle_add(evas_object_evas_get(sb->table));
|
||||||
evas_object_color_set(botbox, 0, 0, 0, 0);
|
evas_object_color_set(sb->botbox, 0, 0, 0, 0);
|
||||||
evas_object_size_hint_min_set(botbox, 0, sb->ephoto->bottom_bar_size);
|
evas_object_size_hint_min_set(sb->botbox, 0, sb->ephoto->bottom_bar_size);
|
||||||
evas_object_size_hint_weight_set(botbox, EVAS_HINT_EXPAND, 0.0);
|
evas_object_size_hint_weight_set(sb->botbox, EVAS_HINT_EXPAND, 0.0);
|
||||||
evas_object_size_hint_fill_set(botbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
|
evas_object_size_hint_fill_set(sb->botbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
|
||||||
elm_table_pack(sb->table, botbox, 0, 2, 4, 1);
|
elm_table_pack(sb->table, sb->botbox, 0, 2, 4, 1);
|
||||||
evas_object_show(botbox);
|
evas_object_show(sb->botbox);
|
||||||
|
|
||||||
sb->infolabel = elm_label_add(sb->table);
|
sb->infolabel = elm_label_add(sb->table);
|
||||||
elm_label_line_wrap_set(sb->infolabel, ELM_WRAP_NONE);
|
elm_label_line_wrap_set(sb->infolabel, ELM_WRAP_NONE);
|
||||||
|
|
Loading…
Reference in New Issue