Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_gadcon.c
Log Message:
lock shelf on gadcon edit and menu
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- e_gadcon.c 23 Nov 2007 09:32:02 -0000 1.89
+++ e_gadcon.c 23 Nov 2007 09:38:30 -0000 1.90
@@ -540,6 +540,7 @@
E_OBJECT_CHECK(gc);
E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE);
e_gadcon_layout_freeze(gc->o_container);
+ e_shelf_locked_set(gc->shelf, 1);
gc->editing = 1;
for (l = gc->clients; l; l = l->next)
{
@@ -568,6 +569,7 @@
e_gadcon_client_edit_end(gcc);
}
e_gadcon_layout_thaw(gc->o_container);
+ e_shelf_locked_set(gc->shelf, 0);
}
EAPI void
@@ -821,6 +823,7 @@
if (gcc->o_control) return;
+ e_shelf_locked_set(gcc->gadcon->shelf, 1);
gcc->gadcon->editing = 1;
gcc->o_control = edje_object_add(gcc->gadcon->evas);
evas_object_layer_set(gcc->o_control, 100);
@@ -942,6 +945,7 @@
if (client->o_control) return;
}
gcc->gadcon->editing = 0;
+ e_shelf_locked_set(gcc->gadcon->shelf, 0);
}
EAPI void
@@ -1155,6 +1159,9 @@
E_OBJECT_CHECK(gcc);
E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
+ e_shelf_locked_set(gcc->gadcon->shelf, 1);
+ e_menu_post_deactivate_callback_set(menu, _e_gadcon_client_cb_menu_post,
gcc);
+
if (!gcc->gadcon->toolbar)
{
mn = e_menu_new();
@@ -1584,8 +1591,9 @@
E_Menu_Item *mi;
int cx, cy;
- zone = e_util_zone_current_get(e_manager_current_get()),
+ zone = e_util_zone_current_get(e_manager_current_get());
+ e_shelf_locked_set(gcc->gadcon->shelf, 1);
mn = e_menu_new();
e_menu_post_deactivate_callback_set(mn, _e_gadcon_client_cb_menu_post,
gcc);
@@ -2157,6 +2165,7 @@
E_Gadcon_Client *gcc;
gcc = data;
+ e_shelf_locked_set(gcc->gadcon->shelf, 0);
if (!gcc->menu) return;
e_object_del(E_OBJECT(gcc->menu));
gcc->menu = NULL;
@@ -2177,6 +2186,7 @@
E_Menu *mn;
int cx, cy, cw, ch;
+ e_shelf_locked_set(gcc->gadcon->shelf, 1);
mn = e_menu_new();
e_menu_post_deactivate_callback_set(mn, _e_gadcon_client_cb_menu_post,
gcc);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
