styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add delete flag to e_border to alert us that this client window is dead

This commit is contained in:
Mike Blumenkrantz 2013-07-26 11:05:17 +01:00
parent 9e1d0627bb
commit d544048b0e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bin/e_border.c
View File

@ -4959,7 +4959,7 @@ _e_border_del(E_Border *bd)
ecore_timer_del(bd->raise_timer);
bd->raise_timer = NULL;
}
if (!bd->already_unparented)
if ((!bd->already_unparented) && (!bd->destroyed))
{
ecore_x_window_reparent(bd->client.win,
bd->zone->container->manager->root,
@ -5069,7 +5069,7 @@ _e_border_cb_window_destroy(void *data __UNUSED__,
e = ev;
bd = e_border_find_by_client_window(e->win);
if (!bd) return ECORE_CALLBACK_PASS_ON;
e_border_hide(bd, 0);
bd->destroyed = 1;
e_object_del(E_OBJECT(bd));
return ECORE_CALLBACK_PASS_ON;
}
@ -5130,6 +5130,9 @@ _e_border_cb_window_hide(void *data __UNUSED__,
else
{
// printf(" hide2\n");
if (bd->delete_requested)
bd->destroyed = 1;
e_border_hide(bd, 0);
e_object_del(E_OBJECT(bd));
}

1
src/bin/e_border.h
View File

@ -561,6 +561,7 @@ struct _E_Border
unsigned int internal_no_reopen : 1;
unsigned int stolen : 1;
Eina_Bool theme_shadow : 1;
Eina_Bool destroyed : 1;
Ecore_Evas *internal_ecore_evas;