enlightenment
/
extra
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

extra: remove popup toolbar when details are opened

This commit is contained in:
Marcel Hollerbach 2017-01-23 22:54:12 +01:00
parent a368556033
commit 4030ddba2f
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/extra_theme_selector.c
View File

@ -197,6 +197,7 @@ static void
_show_details(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
_popup_theme(_ui.win, data);
evas_object_del(_ui.popup_toolbar);
}
static void
@ -333,4 +334,4 @@ extra_theme_small_new(Evas_Object *par, Extra_Theme *theme)
counter ++;
}
return table;
}
}

15
src/bin/extra_util.c
View File

@ -246,9 +246,14 @@ extra_ui_fullscreen_preview(char *path)
}
static void
_popup_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
_popup_block_click_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
elm_popup_dismiss(_ui.popup_toolbar);
}
static void
_popup_del_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
{
elm_popup_dismiss(data);
evas_object_del(obj);
_ui.popup_toolbar = NULL;
}
@ -275,9 +280,11 @@ extra_ui_show_popup_toolbar(Evas_Object *content)
evas_object_size_hint_weight_set(rect, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(rect, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_color_set(rect, 0, 0, 0, 0);
evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _popup_del_cb, tooltip);
evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _popup_block_click_cb, tooltip);
elm_win_resize_object_add(_ui.win, rect);
evas_object_show(rect);
evas_object_event_callback_add(tooltip, EVAS_CALLBACK_DEL, _popup_del_cb, rect);
_ui.popup_toolbar = tooltip;
}
}