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

tooltip : prevent blowing memory up in the middle of function. 

user may remove a tooltip in their callbacks.
this patch is just a sort of the defensive code.
This commit is contained in:
Hermet Park 2016-01-02 21:46:53 +09:00
parent 80fc568aed
commit 3d028e1493
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
legacy/elementary/src/lib/els_tooltip.c
View File

@ -58,11 +58,13 @@ struct _Elm_Tooltip
} rel_pos; } rel_pos;
Elm_Tooltip_Orient orient; /** orientation for tooltip */ Elm_Tooltip_Orient orient; /** orientation for tooltip */
int move_freeze; int move_freeze;
unsigned short ref;
double hide_timeout; /* from theme */ double hide_timeout; /* from theme */
Eina_Bool visible_lock:1; Eina_Bool visible_lock:1;
Eina_Bool changed_style:1; Eina_Bool changed_style:1;
Eina_Bool free_size : 1; Eina_Bool free_size : 1;
Eina_Bool unset_me : 1;
}; };
static void _elm_tooltip_reconfigure(Elm_Tooltip *tt); static void _elm_tooltip_reconfigure(Elm_Tooltip *tt);
@ -73,6 +75,7 @@ static void _elm_tooltip_hide_anim_stop(Elm_Tooltip *tt);
static void _elm_tooltip_show_timer_stop(Elm_Tooltip *tt); static void _elm_tooltip_show_timer_stop(Elm_Tooltip *tt);
static void _elm_tooltip_hide(Elm_Tooltip *tt); static void _elm_tooltip_hide(Elm_Tooltip *tt);
static void _elm_tooltip_data_clean(Elm_Tooltip *tt); static void _elm_tooltip_data_clean(Elm_Tooltip *tt);
static void _elm_tooltip_unset(Elm_Tooltip *tt);
static void static void
_elm_tooltip_content_changed_hints_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) _elm_tooltip_content_changed_hints_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
@ -354,7 +357,15 @@ _elm_tooltip_reconfigure(Elm_Tooltip *tt)
if (!tt->content) if (!tt->content)
{ {
tt->ref++;
tt->content = tt->func((void *)tt->data, tt->owner, tt->tt_win ? : tt->owner); tt->content = tt->func((void *)tt->data, tt->owner, tt->tt_win ? : tt->owner);
tt->ref--;
if (tt->unset_me)
{
_elm_tooltip_unset(tt);
return;
}
if (!tt->content) if (!tt->content)
{ {
WRN("could not create tooltip content!"); WRN("could not create tooltip content!");
@ -697,6 +708,11 @@ static void _elm_tooltip_obj_free_cb(void *data, Evas *e EINA_UNUSED, Evas_Obje
static void static void
_elm_tooltip_unset(Elm_Tooltip *tt) _elm_tooltip_unset(Elm_Tooltip *tt)
{ {
if (tt->ref > 0)
{
tt->unset_me = EINA_TRUE;
return;
}
tt->visible_lock = EINA_FALSE; tt->visible_lock = EINA_FALSE;
_elm_tooltip_hide(tt); _elm_tooltip_hide(tt);
_elm_tooltip_data_clean(tt); _elm_tooltip_data_clean(tt);