enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

No point in setting binding in config 

These bindings are not saved, and we don't want them saved

SVN revision: 45370
This commit is contained in:
Sebastian Dransfeld 2010-01-20 22:36:34 +00:00
parent a89ce69fca
commit 288ba85026
1 changed files with 0 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/bin/e_int_shelf_config.c
View File

@ -11,7 +11,6 @@ static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Co
static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
static void _cb_disable_check_list(void *data, Evas_Object *obj);
static void _calibrate_bindings(void);
#define MODE_CUSTOM 0
#define MODE_BOTTOM_MIDDLE 1
@ -302,7 +301,6 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
e_shelf_populate(cfdata->es);
e_shelf_toggle(cfdata->es, 1);
e_shelf_show(cfdata->es);
_calibrate_bindings();
e_config_save_queue();
cfdata->es->config_dialog = cfd;
return 1; /* Apply was OK */
@ -487,7 +485,6 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
e_shelf_toggle(cfdata->es, 1);
e_zone_useful_geometry_dirty(cfdata->es->zone);
_calibrate_bindings();
e_config_save_queue();
cfdata->es->config_dialog = cfd;
return 1; /* Apply was OK */
@ -503,73 +500,6 @@ _cb_configure(void *data, void *data2)
e_int_gadcon_config_shelf(cfdata->es->gadcon);
}
static void
_calibrate_bindings(void)
{
E_Binding_Edge *bind;
Eina_List *l;
E_Shelf *es;
#define EDGE_BINDING_REMOVE(type, click, delay) \
bind = e_bindings_edge_get("shelf_show", type, click); \
if (bind) \
e_bindings_edge_del(E_BINDING_CONTEXT_ZONE, type, \
0, 1, "shelf_show", NULL, delay);
EDGE_BINDING_REMOVE(E_ZONE_EDGE_LEFT, 0, 0.0);
EDGE_BINDING_REMOVE(E_ZONE_EDGE_RIGHT, 0, 0.0);
EDGE_BINDING_REMOVE(E_ZONE_EDGE_TOP, 0, 0.0);
EDGE_BINDING_REMOVE(E_ZONE_EDGE_BOTTOM, 0, 0.0);
EDGE_BINDING_REMOVE(E_ZONE_EDGE_LEFT, 1, -1.0);
EDGE_BINDING_REMOVE(E_ZONE_EDGE_RIGHT, 1, -1.0);
EDGE_BINDING_REMOVE(E_ZONE_EDGE_TOP, 1, -1.0);
EDGE_BINDING_REMOVE(E_ZONE_EDGE_BOTTOM, 1, -1.0);
#undef EDGE_BINDING_REMOVE
#define EDGE_BINDING_ADD(es, type) \
if (es->cfg->autohide) \
{ \
if (es->cfg->autohide_show_action) \
e_bindings_edge_add(E_BINDING_CONTEXT_ZONE, type, \
0, 1, "shelf_show", NULL, -1.0); \
else \
e_bindings_edge_add(E_BINDING_CONTEXT_ZONE, type, \
0, 1, "shelf_show", NULL, 0.0); \
}
EINA_LIST_FOREACH(e_shelf_list(), l, es)
{
switch(es->gadcon->orient)
{
case E_GADCON_ORIENT_FLOAT:
case E_GADCON_ORIENT_HORIZ:
case E_GADCON_ORIENT_VERT:
/* noop */
break;
case E_GADCON_ORIENT_LEFT:
case E_GADCON_ORIENT_CORNER_LT:
case E_GADCON_ORIENT_CORNER_LB:
EDGE_BINDING_ADD(es, E_ZONE_EDGE_LEFT)
break;
case E_GADCON_ORIENT_RIGHT:
case E_GADCON_ORIENT_CORNER_RT:
case E_GADCON_ORIENT_CORNER_RB:
EDGE_BINDING_ADD(es, E_ZONE_EDGE_RIGHT)
break;
case E_GADCON_ORIENT_TOP:
case E_GADCON_ORIENT_CORNER_TL:
case E_GADCON_ORIENT_CORNER_TR:
EDGE_BINDING_ADD(es, E_ZONE_EDGE_TOP)
break;
case E_GADCON_ORIENT_BOTTOM:
case E_GADCON_ORIENT_CORNER_BL:
case E_GADCON_ORIENT_CORNER_BR:
EDGE_BINDING_ADD(es, E_ZONE_EDGE_BOTTOM)
break;
}
}
#undef EDGE_BINDING_ADD
}
/**--GUI--**/
static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)