NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

genlist: revert 6f177e5db01553276058235a81cbfcc9b2cd4e23 

this broke decoration item text. reverted.
This commit is contained in:
ChunEon Park 2015-01-10 17:27:48 +09:00
parent 8e2647ea16
commit 42dc29b87b
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
legacy/elementary/src/lib/elm_genlist.c
View File

@ -3517,7 +3517,8 @@ _decorate_all_item_unrealize(Elm_Gen_Item *it)
"elm");
}
_view_clear(it->deco_all_view, NULL, &(GL_IT(it)->deco_all_contents));
_view_clear(it->deco_all_view, &(GL_IT(it)->deco_all_texts),
&(GL_IT(it)->deco_all_contents));
edje_object_signal_emit(VIEW(it), SIGNAL_DECORATE_DISABLED, "elm");
@ -4881,7 +4882,8 @@ _decorate_item_unrealize(Elm_Gen_Item *it)
evas_event_freeze(evas_object_evas_get(obj));
_view_clear(GL_IT(it)->deco_it_view, NULL, &(GL_IT(it)->deco_it_contents));
_view_clear(GL_IT(it)->deco_it_view, &(GL_IT(it)->deco_it_texts),
&(GL_IT(it)->deco_it_contents));
edje_object_part_unswallow(it->item->deco_it_view, VIEW(it));
evas_object_smart_member_add(VIEW(it), sd->pan_obj);
@ -5269,7 +5271,7 @@ _decorate_item_realize(Elm_Gen_Item *it)
(GL_IT(it)->deco_it_view, EVAS_CALLBACK_MOUSE_MOVE, _item_mouse_move_cb,
it);
_view_inflate(it->item->deco_it_view, it, NULL,
_view_inflate(it->item->deco_it_view, it, &GL_IT(it)->deco_it_texts,
&GL_IT(it)->deco_it_contents);
edje_object_part_swallow
(it->item->deco_it_view,
@ -6856,6 +6858,8 @@ _elm_genlist_item_item_class_update(Eo *eo_it, Elm_Gen_Item *it,
it->item->nocache_once = EINA_TRUE;
ELM_SAFE_FREE(it->texts, elm_widget_stringlist_free);
ELM_SAFE_FREE(GL_IT(it)->deco_it_texts, elm_widget_stringlist_free);
ELM_SAFE_FREE(GL_IT(it)->deco_all_texts, elm_widget_stringlist_free);
elm_genlist_item_update(eo_it);
}

4
legacy/elementary/src/lib/elm_widget_genlist.h
View File

@ -211,8 +211,8 @@ struct Elm_Gen_Item_Type
Evas_Coord w, h, minw, minh;
Elm_Gen_Item *group_item;
Elm_Genlist_Item_Type type;
Eina_List *deco_it_contents;
Eina_List *deco_all_contents;
Eina_List *deco_it_texts, *deco_it_contents;
Eina_List *deco_all_texts, *deco_all_contents;
Eina_List *flip_contents;
Ecore_Timer *swipe_timer;
Evas_Coord scrl_x, scrl_y, old_scrl_y;