forked from enlightenment/enlightenment
and actually delete the locks dialog if the window is deleted.
SVN revision: 17629
This commit is contained in:
parent
be4f5dfbab
commit
e83b8a72de
|
@ -2551,6 +2551,12 @@ _e_border_free(E_Border *bd)
|
||||||
if (bd->shade.anim) ecore_animator_del(bd->shade.anim);
|
if (bd->shade.anim) ecore_animator_del(bd->shade.anim);
|
||||||
if (bd->border_menu) e_menu_deactivate(bd->border_menu);
|
if (bd->border_menu) e_menu_deactivate(bd->border_menu);
|
||||||
|
|
||||||
|
if (bd->border_locks_dialog)
|
||||||
|
{
|
||||||
|
e_object_del(E_OBJECT(bd->border_locks_dialog));
|
||||||
|
bd->border_locks_dialog = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
_e_border_menus_del(bd);
|
_e_border_menus_del(bd);
|
||||||
|
|
||||||
if (focused == bd)
|
if (focused == bd)
|
||||||
|
@ -2644,6 +2650,12 @@ _e_border_del(E_Border *bd)
|
||||||
|
|
||||||
if (bd->border_menu) e_menu_deactivate(bd->border_menu);
|
if (bd->border_menu) e_menu_deactivate(bd->border_menu);
|
||||||
|
|
||||||
|
if (bd->border_locks_dialog)
|
||||||
|
{
|
||||||
|
e_object_del(E_OBJECT(bd->border_locks_dialog));
|
||||||
|
bd->border_locks_dialog = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
_e_border_menus_del(bd);
|
_e_border_menus_del(bd);
|
||||||
if (bd->raise_timer)
|
if (bd->raise_timer)
|
||||||
{
|
{
|
||||||
|
@ -2723,11 +2735,6 @@ _e_border_menus_del(E_Border *bd)
|
||||||
{
|
{
|
||||||
int was_menu = 0;
|
int was_menu = 0;
|
||||||
|
|
||||||
if (bd->border_locks_dialog)
|
|
||||||
{
|
|
||||||
e_object_del(E_OBJECT(bd->border_locks_dialog));
|
|
||||||
bd->border_locks_dialog = NULL;
|
|
||||||
}
|
|
||||||
if (bd->border_remember_menu)
|
if (bd->border_remember_menu)
|
||||||
{
|
{
|
||||||
e_object_del(E_OBJECT(bd->border_remember_menu));
|
e_object_del(E_OBJECT(bd->border_remember_menu));
|
||||||
|
@ -6133,7 +6140,9 @@ static void
|
||||||
_e_border_menu_cb_locks(void *data, E_Menu *m, E_Menu_Item *mi)
|
_e_border_menu_cb_locks(void *data, E_Menu *m, E_Menu_Item *mi)
|
||||||
{
|
{
|
||||||
E_Border *bd;
|
E_Border *bd;
|
||||||
|
|
||||||
bd = data;
|
bd = data;
|
||||||
|
if (bd->border_locks_dialog) return;
|
||||||
e_int_border_locks(bd);
|
e_int_border_locks(bd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -63,6 +63,7 @@ e_int_border_locks(E_Border *bd)
|
||||||
/* create config diaolg for NULL object/data */
|
/* create config diaolg for NULL object/data */
|
||||||
cfd = e_config_dialog_new(bd->zone->container,
|
cfd = e_config_dialog_new(bd->zone->container,
|
||||||
_("Window Locks"), NULL, 0, &v, bd);
|
_("Window Locks"), NULL, 0, &v, bd);
|
||||||
|
bd->border_locks_dialog = cfd;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**--CREATE--**/
|
/**--CREATE--**/
|
||||||
|
|
Loading…
Reference in New Issue