diff options
| author | Thiep Ha <thiepha@gmail.com> | 2018-01-05 17:28:22 +0900 |
|---|---|---|
| committer | Thiep Ha <thiepha@gmail.com> | 2018-01-05 17:28:22 +0900 |
| commit | f912f486703bbb229943eb56361c2fc353edfb2f (patch) | |
| tree | 403b5210c830944dd9fefcd8eabe8e31241b6d09 | |
| parent | 6d7adad906391bdb2e838b61d332f952da2f3e0a (diff) | |
| download | efl-devs/thiep/cop.tar.gz | |
fix bug icons list and icon createdevs/thiep/cop
| -rw-r--r-- | src/lib/elementary/efl_selection_manager.c | 3 | ||||
| -rw-r--r-- | src/lib/elementary/efl_ui_dnd.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/elementary/efl_selection_manager.c b/src/lib/elementary/efl_selection_manager.c index 1faa368168..96d496c5d8 100644 --- a/src/lib/elementary/efl_selection_manager.c +++ b/src/lib/elementary/efl_selection_manager.c @@ -4409,8 +4409,9 @@ _drag_anim_start(Sel_Manager_Drag_Container *dc) dc->timer = NULL; if (dc->icon_func) { + Eina_Position2D pos_ret; Evas_Object *temp_win = elm_win_add(NULL, "Temp", ELM_WIN_DND); - Evas_Object *final_icon = dc->icon_func(dc->icon_func_data, temp_win, dc->cont, NULL); + Evas_Object *final_icon = dc->icon_func(dc->icon_func_data, temp_win, dc->cont, &pos_ret); evas_object_geometry_get(final_icon, NULL, NULL, &dc->final_icon.w, &dc->final_icon.h); evas_object_del(final_icon); evas_object_del(temp_win); diff --git a/src/lib/elementary/efl_ui_dnd.c b/src/lib/elementary/efl_ui_dnd.c index 56f5f12614..4ef8c1ac82 100644 --- a/src/lib/elementary/efl_ui_dnd.c +++ b/src/lib/elementary/efl_ui_dnd.c @@ -224,7 +224,6 @@ struct _Dnd_Cont_Drop struct _Item_Container_Drag_Info { - Eina_List *icons; Elm_Drag_User_Info user_info; Elm_Object_Item *it; Elm_Item_Container_Data_Get_Cb data_get_cb; @@ -766,7 +765,7 @@ _cont_drag_icon_list_create(void *data, Efl_Object *obj EINA_UNUSED) Item_Container_Drag_Info *di; di = data; - return di->icons; + return di->user_info.icons; } static Efl_Object * |