forked from enlightenment/enlightenment
If we are passed a zone, use it rather than regetting zone.
Fix some formatting. SVN revision: 44908
This commit is contained in:
parent
56178c136b
commit
d877b90de5
|
@ -137,19 +137,19 @@ e_configure_show(E_Container *con)
|
||||||
mask = 0;
|
mask = 0;
|
||||||
kg = evas_object_key_grab(o, "Tab", mask, ~mask, 0);
|
kg = evas_object_key_grab(o, "Tab", mask, ~mask, 0);
|
||||||
if (!kg)
|
if (!kg)
|
||||||
fprintf(stderr,"ERROR: unable to redirect \"Tab\" key events to object %p.\n", o);
|
fprintf(stderr,"ERROR: unable to redirect \"Tab\" key events to object %p.\n", o);
|
||||||
mask = evas_key_modifier_mask_get(e_win_evas_get(eco->win), "Shift");
|
mask = evas_key_modifier_mask_get(e_win_evas_get(eco->win), "Shift");
|
||||||
kg = evas_object_key_grab(o, "Tab", mask, ~mask, 0);
|
kg = evas_object_key_grab(o, "Tab", mask, ~mask, 0);
|
||||||
if (!kg)
|
if (!kg)
|
||||||
fprintf(stderr,"ERROR: unable to redirect \"Tab\" key events to object %p.\n", o);
|
fprintf(stderr,"ERROR: unable to redirect \"Tab\" key events to object %p.\n", o);
|
||||||
mask = 0;
|
mask = 0;
|
||||||
kg = evas_object_key_grab(o, "Return", mask, ~mask, 0);
|
kg = evas_object_key_grab(o, "Return", mask, ~mask, 0);
|
||||||
if (!kg)
|
if (!kg)
|
||||||
fprintf(stderr,"ERROR: unable to redirect \"Return\" key events to object %p.\n", o);
|
fprintf(stderr,"ERROR: unable to redirect \"Return\" key events to object %p.\n", o);
|
||||||
mask = 0;
|
mask = 0;
|
||||||
kg = evas_object_key_grab(o, "KP_Enter", mask, ~mask, 0);
|
kg = evas_object_key_grab(o, "KP_Enter", mask, ~mask, 0);
|
||||||
if (!kg)
|
if (!kg)
|
||||||
fprintf(stderr,"ERROR: unable to redirect \"KP_Enter\" key events to object %p.\n", o);
|
fprintf(stderr,"ERROR: unable to redirect \"KP_Enter\" key events to object %p.\n", o);
|
||||||
evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN,
|
evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN,
|
||||||
_e_configure_keydown_cb, eco->win);
|
_e_configure_keydown_cb, eco->win);
|
||||||
|
|
||||||
|
|
|
@ -6,9 +6,9 @@
|
||||||
|
|
||||||
/* actual module specifics */
|
/* actual module specifics */
|
||||||
|
|
||||||
static void _e_mod_action_conf_cb(E_Object *obj, const char *params);
|
static void _e_mod_action_conf_cb(E_Object *obj, const char *params);
|
||||||
static void _e_mod_conf_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
static void _e_mod_conf_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||||
static void _e_mod_menu_add(void *data, E_Menu *m);
|
static void _e_mod_menu_add(void *data, E_Menu *m);
|
||||||
|
|
||||||
static E_Module *conf_module = NULL;
|
static E_Module *conf_module = NULL;
|
||||||
static E_Action *act = NULL;
|
static E_Action *act = NULL;
|
||||||
|
@ -64,7 +64,7 @@ static void
|
||||||
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
|
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
|
||||||
{
|
{
|
||||||
Evas_Coord mw, mh;
|
Evas_Coord mw, mh;
|
||||||
|
|
||||||
mw = 0, mh = 0;
|
mw = 0, mh = 0;
|
||||||
edje_object_size_min_get(gcc->o_base, &mw, &mh);
|
edje_object_size_min_get(gcc->o_base, &mw, &mh);
|
||||||
if ((mw < 1) || (mh < 1))
|
if ((mw < 1) || (mh < 1))
|
||||||
|
@ -165,7 +165,7 @@ static void
|
||||||
_e_mod_action_conf_cb(E_Object *obj, const char *params)
|
_e_mod_action_conf_cb(E_Object *obj, const char *params)
|
||||||
{
|
{
|
||||||
E_Zone *zone = NULL;
|
E_Zone *zone = NULL;
|
||||||
|
|
||||||
if (obj)
|
if (obj)
|
||||||
{
|
{
|
||||||
if (obj->type == E_MANAGER_TYPE)
|
if (obj->type == E_MANAGER_TYPE)
|
||||||
|
@ -173,15 +173,15 @@ _e_mod_action_conf_cb(E_Object *obj, const char *params)
|
||||||
else if (obj->type == E_CONTAINER_TYPE)
|
else if (obj->type == E_CONTAINER_TYPE)
|
||||||
zone = e_util_zone_current_get(((E_Container *)obj)->manager);
|
zone = e_util_zone_current_get(((E_Container *)obj)->manager);
|
||||||
else if (obj->type == E_ZONE_TYPE)
|
else if (obj->type == E_ZONE_TYPE)
|
||||||
zone = e_util_zone_current_get(((E_Zone *)obj)->container->manager);
|
zone = ((E_Zone *)obj);
|
||||||
else
|
else
|
||||||
zone = e_util_zone_current_get(e_manager_current_get());
|
zone = e_util_zone_current_get(e_manager_current_get());
|
||||||
}
|
}
|
||||||
if (!zone) zone = e_util_zone_current_get(e_manager_current_get());
|
if (!zone) zone = e_util_zone_current_get(e_manager_current_get());
|
||||||
if (zone && params)
|
if ((zone) && (params))
|
||||||
e_configure_registry_call(params, zone->container, params);
|
e_configure_registry_call(params, zone->container, params);
|
||||||
else if (zone)
|
else if (zone)
|
||||||
e_configure_show(zone->container);
|
e_configure_show(zone->container);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* menu item callback(s) */
|
/* menu item callback(s) */
|
||||||
|
@ -235,6 +235,7 @@ static E_Menu *
|
||||||
_e_mod_submenu_modes_get(void)
|
_e_mod_submenu_modes_get(void)
|
||||||
{
|
{
|
||||||
E_Menu *m = e_menu_new();
|
E_Menu *m = e_menu_new();
|
||||||
|
|
||||||
if (!m) return NULL;
|
if (!m) return NULL;
|
||||||
e_menu_pre_activate_callback_set(m, _e_mod_submenu_modes_fill, NULL);
|
e_menu_pre_activate_callback_set(m, _e_mod_submenu_modes_fill, NULL);
|
||||||
return m;
|
return m;
|
||||||
|
|
Loading…
Reference in New Issue