multi-file: ++implementation.

support live edit function.
This commit is contained in:
Hermet Park 2016-07-20 18:51:53 +09:00
parent a768577e6c
commit 58a1f10608
3 changed files with 4 additions and 6 deletions

View File

@ -271,6 +271,8 @@ file_mgr_file_focus(Enventor_Item *it)
//Reset context if the find/replace is working on. //Reset context if the find/replace is working on.
search_reset(); search_reset();
//Cancel if the live edit mode is turned on.
live_edit_cancel(EINA_FALSE);
} }
Enventor_Item * Enventor_Item *

View File

@ -2171,9 +2171,7 @@ Eina_Bool
live_edit_cancel(Eina_Bool phase_in) live_edit_cancel(Eina_Bool phase_in)
{ {
live_data *ld = g_ld; live_data *ld = g_ld;
EINA_SAFETY_ON_NULL_RETURN_VAL(ld, EINA_FALSE); if (!ld || !ld->on) return EINA_FALSE;
if (!ld->on) return EINA_FALSE;
//Dismiss Relative To Ctxpopup firstly. //Dismiss Relative To Ctxpopup firstly.
if (phase_in && ld->rel_to_info.ctxpopup) if (phase_in && ld->rel_to_info.ctxpopup)

View File

@ -746,8 +746,6 @@ _enventor_object_live_view_get(Eo *obj EINA_UNUSED,
return edj_mgr_obj_get(); return edj_mgr_obj_get();
} }
//TODO: Might need for items
EOLIAN static void EOLIAN static void
_enventor_object_disabled_set(Eo *obj EINA_UNUSED, _enventor_object_disabled_set(Eo *obj EINA_UNUSED,
Enventor_Object_Data *pd, Enventor_Object_Data *pd,
@ -756,7 +754,7 @@ _enventor_object_disabled_set(Eo *obj EINA_UNUSED,
disabled = !!disabled; disabled = !!disabled;
if (pd->disabled == disabled) return; if (pd->disabled == disabled) return;
edit_disabled_set(pd->main_it->ed, disabled); edit_disabled_set(pd->focused_it->ed, disabled);
pd->disabled = !!disabled; pd->disabled = !!disabled;
} }