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

efl ui format - only sety format fun to null if format func free exists

This commit is contained in:
Carsten Haitzler 2021-03-02 13:11:35 +00:00
parent 67acb15a1f
commit 81f962da75
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/elementary/efl_ui_format.c
View File

@ -336,7 +336,10 @@ _efl_ui_format_decimal_places_get(Eo *obj EINA_UNUSED, Efl_Ui_Format_Data *pd)
EOLIAN static void
_efl_ui_format_efl_object_destructor(Eo *obj, Efl_Ui_Format_Data *pd EINA_UNUSED)
{
efl_ui_format_func_set(obj, NULL, NULL, NULL);
if (pd->format_func_free)
{
efl_ui_format_func_set(obj, NULL, NULL, NULL);
}
efl_ui_format_values_set(obj, NULL);
efl_ui_format_string_set(obj, NULL, 0);
efl_destructor(efl_super(obj, EFL_UI_FORMAT_MIXIN));

6
src/lib/elementary/elm_slider.c
View File

@ -1270,9 +1270,9 @@ _elm_slider_efl_ui_format_format_cb_set(Eo *obj, Elm_Slider_Data *sd, void *func
if (sd->format_cb_data && sd->format_free_cb)
sd->format_free_cb(sd->format_cb_data);
sd->format_cb = NULL;
sd->format_cb_data = NULL;
sd->format_free_cb = NULL;
// sd->format_cb = NULL;
// sd->format_cb_data = NULL;
// sd->format_free_cb = NULL;
if (efl_invalidated_get(obj)) return;