discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=038df92cdd26a88c9b00c60bbde0b9dfc8551c2f

commit 038df92cdd26a88c9b00c60bbde0b9dfc8551c2f
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Thu Apr 30 16:06:09 2015 -0400

    only apply fwin focus to main efm object if no icon is editing
---
 src/bin/e_fm.c               | 10 ++++++++++
 src/modules/fileman/e_fwin.c |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 1792c42..72dacc3 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -7790,6 +7790,15 @@ _e_fm2_cb_icon_thumb_gen(void *data, Evas_Object *obj, 
void *event_info EINA_UNU
 }
 
 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)
 {
    Evas_Event_Key_Down *ev = 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);
diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c
index d99d575..8dc1619 100644
--- a/src/modules/fileman/e_fwin.c
+++ b/src/modules/fileman/e_fwin.c
@@ -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 *

-- 


Reply via email to