yakov pushed a commit to branch master. http://git.enlightenment.org/tools/erigo.git/commit/?id=5034cc911f0a5cf6dc5ec4bb81adf058c0df649d
commit 5034cc911f0a5cf6dc5ec4bb81adf058c0df649d Author: Yakov Goldberg <yako...@samsung.com> Date: Thu Dec 3 14:41:46 2015 +0200 Fixing showing/hiding of drag border --- src/bin/gui/editor.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/bin/gui/editor.c b/src/bin/gui/editor.c index a5eb8f9..b5173d5 100644 --- a/src/bin/gui/editor.c +++ b/src/bin/gui/editor.c @@ -395,13 +395,13 @@ _wdg_border_draw(const Gui_Widget *wdg, Eina_Bool visibility, int border_type_co prev_oy = oy; prev_ow = ow; prev_oh = oh; - prev_visibility = visibility; } else { return; } } + prev_visibility = visibility; switch (border_type_color) { @@ -1503,22 +1503,20 @@ _drop_target_enter(void *data, Evas_Object *obj) else { const Gui_Widget *main_wdg = wdg_main_wdg_get(drop_target_wdg); - _wdg_border_draw(main_wdg, EINA_FALSE, BORDER_DROP_TARGET); di = wdg_data_get(main_wdg, EDITOR_DND_DATA); } - _wdg_border_draw(drop_target_wdg, EINA_TRUE, BORDER_DROP_TARGET); di->eo_ref_count++; } else if (canvas_drop_target != NULL) { eo_do(canvas_drop_target, di = eo_key_data_get(EDITOR_DND_DATA)); - _wdg_border_draw(NULL, EINA_FALSE, BORDER_DROP_TARGET); } else { ERR("Drop target is wrong. If you see this message, something is terribly wrong!"); return; } + _wdg_border_draw(drop_target_wdg, EINA_TRUE, BORDER_DROP_TARGET); if (drop_target_wdg && !strcmp(wdg_class_name_get(drop_target_wdg), DB_DEF_TABLE_CLASS)) { @@ -1554,7 +1552,6 @@ _drop_target_leave(void *data, Evas_Object *obj) Eo *canvas_drop_target = obj, *drop_target_wdg_eo = NULL; DnD_Main_Obj_Info *di = NULL; const Gui_Session *session = NULL; - _wdg_border_draw(drop_target_wdg, EINA_FALSE, BORDER_DROP_TARGET); if (drop_target_wdg) { session = gui_context_editor_session_get(wdg_context_get(drop_target_wdg)); @@ -1574,6 +1571,7 @@ _drop_target_leave(void *data, Evas_Object *obj) ERR("Drop target is wrong. If you see this message, something is terribly wrong!"); return; } + _wdg_border_draw(drop_target_wdg, EINA_FALSE, BORDER_DROP_TARGET); if (drop_target_wdg_eo && !strcmp(wdg_class_name_get(drop_target_wdg), DB_DEF_BOX_CLASS)) { @@ -1673,8 +1671,6 @@ _drop_target_drop(Gui_Widget *drop_target_wdg, Eo *canvas_drop_target, const cha if (!ctx) return EINA_FALSE; const Gui_Session *session = gui_context_editor_session_get(ctx); - - _wdg_border_draw(NULL, EINA_FALSE, BORDER_DROP_TARGET); if (drop_target_wdg) { di = wdg_data_get(wdg_main_wdg_get(drop_target_wdg), EDITOR_DND_DATA); @@ -1687,6 +1683,7 @@ _drop_target_drop(Gui_Widget *drop_target_wdg, Eo *canvas_drop_target, const cha { ERR("Drop target is wrong. If you see this message something is terribly wrong!"); } + _wdg_border_draw(drop_target_wdg, EINA_FALSE, BORDER_DROP_TARGET); if (!drop_target_wdg) { --