Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c
Log Message:
fix - border menu goes when border goes now
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -3 -r1.358 -r1.359
--- e_border.c 14 Aug 2005 22:22:17 -0000 1.358
+++ e_border.c 15 Aug 2005 10:20:45 -0000 1.359
@@ -2027,6 +2027,8 @@
bd->pending_move_resize =
evas_list_remove_list(bd->pending_move_resize, bd->pending_move_resize);
}
+ if (bd->border_menu) e_menu_deactivate(bd->border_menu);
+
_e_border_menus_del(bd);
if (focused == bd)
@@ -2108,6 +2110,9 @@
{
E_Event_Border_Remove *ev;
+ if (bd->border_menu) e_menu_deactivate(bd->border_menu);
+
+ _e_border_menus_del(bd);
/*
if (!bd->dangling_ref_check)
bd->dangling_ref_check = ecore_timer_add(1.0,
_e_border_del_dangling_ref_check, bd);
@@ -2137,35 +2142,46 @@
static void
_e_border_menus_del(E_Border *bd)
{
+ int was_menu = 0;
+
if (bd->border_locks_menu)
{
e_object_del(E_OBJECT(bd->border_locks_menu));
bd->border_locks_menu = NULL;
+ was_menu = 1;
}
if (bd->border_locks_user_menu)
{
e_object_del(E_OBJECT(bd->border_locks_user_menu));
bd->border_locks_user_menu = NULL;
+ was_menu = 1;
}
if (bd->border_locks_application_menu)
{
e_object_del(E_OBJECT(bd->border_locks_application_menu));
bd->border_locks_application_menu = NULL;
+ was_menu = 1;
}
if (bd->border_remember_menu)
{
e_object_del(E_OBJECT(bd->border_remember_menu));
bd->border_remember_menu = NULL;
+ was_menu = 1;
}
if (bd->border_stacking_menu)
{
e_object_del(E_OBJECT(bd->border_stacking_menu));
bd->border_stacking_menu = NULL;
+ was_menu = 1;
}
if (bd->border_menu)
{
e_object_del(E_OBJECT(bd->border_menu));
bd->border_menu = NULL;
+ was_menu = 1;
+ }
+ if (was_menu)
+ {
}
}
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
