yakov pushed a commit to branch master.

http://git.enlightenment.org/tools/erigo.git/commit/?id=f8b16e13c966209a05ba0b4cb78826bb3849871c

commit f8b16e13c966209a05ba0b4cb78826bb3849871c
Author: Yakov Goldberg <yako...@samsung.com>
Date:   Wed Nov 25 17:45:12 2015 +0200

    Fix some visibility issues for dragging inside Layout and Naviframe
---
 src/bin/gui/editor.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/bin/gui/editor.c b/src/bin/gui/editor.c
index 7bf8253..882bb7e 100644
--- a/src/bin/gui/editor.c
+++ b/src/bin/gui/editor.c
@@ -1612,6 +1612,14 @@ _drop_target_leave(void *data, Evas_Object *obj)
              di->packed = EINA_FALSE;
           }
      }
+   else if (drop_target_wdg_eo && !strcmp(wdg_class_name_get(drop_target_wdg), 
DB_DEF_LAYOUT_CLASS))
+     {
+        di->packed = EINA_FALSE;
+     }
+   else if (drop_target_wdg_eo && !strcmp(wdg_class_name_get(drop_target_wdg), 
DB_DEF_NAVIFRAME_CLASS))
+     {
+        di->packed = EINA_FALSE;
+     }
 
    if (di->eo_cur && IS_MAIN(drop_target_wdg) && (di->eo_cur != 
session_eo_get(session, dnd_drag_wdg_get())))
      {
@@ -2186,11 +2194,8 @@ _drop_target_pos(void *data, Eo *obj, Evas_Coord x, 
Evas_Coord y, Elm_Xdnd_Actio
      }
    else
      {
-        if (!di->drop_instead_item_obj)
-          {
-             eo_do(di->eo_cur, efl_gfx_visible_set(EINA_TRUE));
-             dnd_drag_window_object_visibility_set(EINA_FALSE);
-          }
+        eo_do(di->eo_cur, efl_gfx_visible_set(EINA_TRUE));
+        dnd_drag_window_object_visibility_set(EINA_FALSE);
      }
 
    if (drop_target_wdg && !strcmp(wdg_class_name_get(drop_target_wdg), 
DB_DEF_BOX_CLASS))
@@ -2565,6 +2570,9 @@ _drop_target_pos(void *data, Eo *obj, Evas_Coord x, 
Evas_Coord y, Elm_Xdnd_Actio
                             ieid = EID_ID_GET(val);
                             if (ieid == di->drop_instead_item_obj)
                               {
+                                 /* Until normal packing is not implemented 
for Naviframe,
+                                  * change position of dragged eo. */
+                                 eo_do(di->eo_cur, 
efl_gfx_position_set(di->ox, di->oy));
                                  di->packed = EINA_TRUE;
                               }
                          }

-- 


Reply via email to