hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=58a1f1060875cd7a48871370baeaf5b180fd8798
commit 58a1f1060875cd7a48871370baeaf5b180fd8798 Author: Hermet Park <[email protected]> Date: Wed Jul 20 18:51:53 2016 +0900 multi-file: ++implementation. support live edit function. --- src/bin/file_mgr.c | 2 ++ src/bin/live_edit.c | 4 +--- src/lib/enventor_smart.c | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/bin/file_mgr.c b/src/bin/file_mgr.c index 87893e9..5e5019a 100644 --- a/src/bin/file_mgr.c +++ b/src/bin/file_mgr.c @@ -271,6 +271,8 @@ file_mgr_file_focus(Enventor_Item *it) //Reset context if the find/replace is working on. search_reset(); + //Cancel if the live edit mode is turned on. + live_edit_cancel(EINA_FALSE); } Enventor_Item * diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c index 521f5c3..9ae89b4 100644 --- a/src/bin/live_edit.c +++ b/src/bin/live_edit.c @@ -2171,9 +2171,7 @@ Eina_Bool live_edit_cancel(Eina_Bool phase_in) { live_data *ld = g_ld; - EINA_SAFETY_ON_NULL_RETURN_VAL(ld, EINA_FALSE); - - if (!ld->on) return EINA_FALSE; + if (!ld || !ld->on) return EINA_FALSE; //Dismiss Relative To Ctxpopup firstly. if (phase_in && ld->rel_to_info.ctxpopup) diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c index de9e331..d1f058c 100644 --- a/src/lib/enventor_smart.c +++ b/src/lib/enventor_smart.c @@ -746,8 +746,6 @@ _enventor_object_live_view_get(Eo *obj EINA_UNUSED, return edj_mgr_obj_get(); } - -//TODO: Might need for items EOLIAN static void _enventor_object_disabled_set(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd, @@ -756,7 +754,7 @@ _enventor_object_disabled_set(Eo *obj EINA_UNUSED, disabled = !!disabled; if (pd->disabled == disabled) return; - edit_disabled_set(pd->main_it->ed, disabled); + edit_disabled_set(pd->focused_it->ed, disabled); pd->disabled = !!disabled; } --
