summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiep Ha <thiepha@gmail.com>2018-01-05 17:28:22 +0900
committerThiep Ha <thiepha@gmail.com>2018-01-05 17:28:22 +0900
commitf912f486703bbb229943eb56361c2fc353edfb2f (patch)
tree403b5210c830944dd9fefcd8eabe8e31241b6d09
parent6d7adad906391bdb2e838b61d332f952da2f3e0a (diff)
fix bug icons list and icon createdevs/thiep/cop
-rw-r--r--src/lib/elementary/efl_selection_manager.c3
-rw-r--r--src/lib/elementary/efl_ui_dnd.c3
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)
4409 dc->timer = NULL; 4409 dc->timer = NULL;
4410 if (dc->icon_func) 4410 if (dc->icon_func)
4411 { 4411 {
4412 Eina_Position2D pos_ret;
4412 Evas_Object *temp_win = elm_win_add(NULL, "Temp", ELM_WIN_DND); 4413 Evas_Object *temp_win = elm_win_add(NULL, "Temp", ELM_WIN_DND);
4413 Evas_Object *final_icon = dc->icon_func(dc->icon_func_data, temp_win, dc->cont, NULL); 4414 Evas_Object *final_icon = dc->icon_func(dc->icon_func_data, temp_win, dc->cont, &pos_ret);
4414 evas_object_geometry_get(final_icon, NULL, NULL, &dc->final_icon.w, &dc->final_icon.h); 4415 evas_object_geometry_get(final_icon, NULL, NULL, &dc->final_icon.w, &dc->final_icon.h);
4415 evas_object_del(final_icon); 4416 evas_object_del(final_icon);
4416 evas_object_del(temp_win); 4417 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
224 224
225struct _Item_Container_Drag_Info 225struct _Item_Container_Drag_Info
226{ 226{
227 Eina_List *icons;
228 Elm_Drag_User_Info user_info; 227 Elm_Drag_User_Info user_info;
229 Elm_Object_Item *it; 228 Elm_Object_Item *it;
230 Elm_Item_Container_Data_Get_Cb data_get_cb; 229 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)
766 Item_Container_Drag_Info *di; 765 Item_Container_Drag_Info *di;
767 766
768 di = data; 767 di = data;
769 return di->icons; 768 return di->user_info.icons;
770} 769}
771 770
772static Efl_Object * 771static Efl_Object *