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

only apply fwin focus to main efm object if no icon is editing

This commit is contained in:
Mike Blumenkrantz 2015-04-30 16:06:09 -04:00
parent 9976e1610a
commit 038df92cdd
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bin/e_fm.c
View File

@ -7789,6 +7789,15 @@ _e_fm2_cb_icon_thumb_gen(void *data, Evas_Object *obj, void *event_info EINA_UNU
_e_fm2_icon_icon_set(ic);
}
static void
_e_fm2_cb_focus_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
E_Fm2_Smart_Data *sd = data;
if (sd->iop_icon && sd->iop_icon->entry_widget)
e_widget_focus_set(sd->iop_icon->entry_widget, 1);
}
static void
_e_fm2_cb_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info)
{
@ -8507,6 +8516,7 @@ _e_fm2_smart_add(Evas_Object *obj)
evas_object_show(sd->underlay);
evas_object_event_callback_add(obj, EVAS_CALLBACK_KEY_DOWN, _e_fm2_cb_key_down, sd);
//evas_object_event_callback_add(obj, EVAS_CALLBACK_FOCUS_IN, _e_fm2_cb_focus_in, sd);
evas_object_event_callback_add(sd->underlay, EVAS_CALLBACK_MOUSE_DOWN, _e_fm2_cb_mouse_down, sd);
evas_object_event_callback_add(sd->underlay, EVAS_CALLBACK_MOUSE_UP, _e_fm2_cb_mouse_up, sd);
evas_object_event_callback_add(sd->underlay, EVAS_CALLBACK_MOUSE_MOVE, _e_fm2_cb_mouse_move, sd);

3
src/modules/fileman/e_fwin.c
View File

@ -667,7 +667,8 @@ _e_fwin_cb_focus(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
{
E_Fwin *fwin = data;
evas_object_focus_set(fwin->cur_page->fm_obj, 1);
if (!e_fm2_icon_editing_get(fwin->cur_page->fm_obj))
evas_object_focus_set(fwin->cur_page->fm_obj, 1);
}
static E_Fwin *