jf_simon
/
enlightenment_my
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

set parent after dialog is shown 

SVN revision: 75368
This commit is contained in:
Mike Blumenkrantz 2012-08-17 08:09:31 +00:00
parent dd83f4a7d1
commit ac19f221ff
2 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/modules/conf_keybindings/e_int_config_keybindings.c
View File

@ -59,9 +59,6 @@ static void _grab_wnd_show(E_Config_Dialog_Data *cfdata);
static Eina_Bool _grab_key_down_cb(void *data, static Eina_Bool _grab_key_down_cb(void *data,
int type, int type,
void *event); void *event);
static Eina_Bool _grab_mouse_dumb_cb(void *data,
int type,
void *event);
struct _E_Config_Dialog_Data struct _E_Config_Dialog_Data
{ {
@ -983,26 +980,13 @@ _grab_wnd_show(E_Config_Dialog_Data *cfdata)
cfdata->locals.bind_win = ecore_x_window_input_new(man->root, 0, 0, 1, 1); cfdata->locals.bind_win = ecore_x_window_input_new(man->root, 0, 0, 1, 1);
ecore_x_window_show(cfdata->locals.bind_win); ecore_x_window_show(cfdata->locals.bind_win);
e_grabinput_get(cfdata->locals.bind_win, 0, cfdata->locals.bind_win); e_grabinput_get(0, 0, cfdata->locals.bind_win);
cfdata->locals.handlers = eina_list_append(cfdata->locals.handlers, cfdata->locals.handlers = eina_list_append(cfdata->locals.handlers,
ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, ecore_event_handler_add(ECORE_EVENT_KEY_DOWN,
_grab_key_down_cb, cfdata)); _grab_key_down_cb, cfdata));
cfdata->locals.handlers = eina_list_append(cfdata->locals.handlers,
ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN,
_grab_mouse_dumb_cb, NULL));
cfdata->locals.handlers = eina_list_append(cfdata->locals.handlers,
ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_UP,
_grab_mouse_dumb_cb, NULL));
cfdata->locals.handlers = eina_list_append(cfdata->locals.handlers,
ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL,
_grab_mouse_dumb_cb, NULL));
e_dialog_parent_set(cfdata->locals.dia, cfdata->cfd->dia->win);
e_dialog_show(cfdata->locals.dia); e_dialog_show(cfdata->locals.dia);
e_dialog_parent_set(cfdata->locals.dia, cfdata->cfd->dia->win);
} }
static void static void
@ -1016,7 +1000,7 @@ _grab_wnd_hide(E_Config_Dialog_Data *cfdata)
e_object_del(E_OBJECT(cfdata->locals.dia)); e_object_del(E_OBJECT(cfdata->locals.dia));
cfdata->locals.dia = NULL; cfdata->locals.dia = NULL;
e_grabinput_release(cfdata->locals.bind_win, cfdata->locals.bind_win); e_grabinput_release(0, cfdata->locals.bind_win);
ecore_x_window_free(cfdata->locals.bind_win); ecore_x_window_free(cfdata->locals.bind_win);
cfdata->locals.bind_win = 0; cfdata->locals.bind_win = 0;
} }
@ -1213,13 +1197,6 @@ _grab_key_down_cb(void *data,
return ECORE_CALLBACK_PASS_ON; return ECORE_CALLBACK_PASS_ON;
} }
static Eina_Bool
_grab_mouse_dumb_cb(__UNUSED__ void *data,
__UNUSED__ int type,
__UNUSED__ void *event)
{
return ECORE_CALLBACK_RENEW;
}
/********** Helper *********************************/ /********** Helper *********************************/
static void static void

2
src/modules/conf_keybindings/e_int_config_mousebindings.c
View File

@ -1322,8 +1322,8 @@ _grab_wnd_show(E_Config_Dialog_Data *cfdata)
ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL, ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL,
_grab_mouse_wheel_cb, cfdata)); _grab_mouse_wheel_cb, cfdata));
e_dialog_parent_set(cfdata->locals.dia, cfdata->cfd->dia->win);
e_dialog_show(cfdata->locals.dia); e_dialog_show(cfdata->locals.dia);
e_dialog_parent_set(cfdata->locals.dia, cfdata->cfd->dia->win);
} }
static void static void