summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2015-01-10 17:27:48 +0900
committerChunEon Park <hermet@hermet.pe.kr>2015-01-10 17:27:48 +0900
commitac2a4019f7de4b418fead98f778ce8178d7b8a28 (patch)
treece0a9582419fb9a7fbaa65b5be770ea59721b961
parent12aac6d3cc36437019ba9866f9ae76f8683ab055 (diff)
genlist: revert 6f177e5db01553276058235a81cbfcc9b2cd4e23
this broke decoration item text. reverted.
-rw-r--r--src/lib/elm_genlist.c10
-rw-r--r--src/lib/elm_widget_genlist.h4
2 files changed, 9 insertions, 5 deletions
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 2134dbd38..c3e9facd8 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -3517,7 +3517,8 @@ _decorate_all_item_unrealize(Elm_Gen_Item *it)
3517 "elm"); 3517 "elm");
3518 } 3518 }
3519 3519
3520 _view_clear(it->deco_all_view, NULL, &(GL_IT(it)->deco_all_contents)); 3520 _view_clear(it->deco_all_view, &(GL_IT(it)->deco_all_texts),
3521 &(GL_IT(it)->deco_all_contents));
3521 3522
3522 edje_object_signal_emit(VIEW(it), SIGNAL_DECORATE_DISABLED, "elm"); 3523 edje_object_signal_emit(VIEW(it), SIGNAL_DECORATE_DISABLED, "elm");
3523 3524
@@ -4881,7 +4882,8 @@ _decorate_item_unrealize(Elm_Gen_Item *it)
4881 4882
4882 evas_event_freeze(evas_object_evas_get(obj)); 4883 evas_event_freeze(evas_object_evas_get(obj));
4883 4884
4884 _view_clear(GL_IT(it)->deco_it_view, NULL, &(GL_IT(it)->deco_it_contents)); 4885 _view_clear(GL_IT(it)->deco_it_view, &(GL_IT(it)->deco_it_texts),
4886 &(GL_IT(it)->deco_it_contents));
4885 4887
4886 edje_object_part_unswallow(it->item->deco_it_view, VIEW(it)); 4888 edje_object_part_unswallow(it->item->deco_it_view, VIEW(it));
4887 evas_object_smart_member_add(VIEW(it), sd->pan_obj); 4889 evas_object_smart_member_add(VIEW(it), sd->pan_obj);
@@ -5269,7 +5271,7 @@ _decorate_item_realize(Elm_Gen_Item *it)
5269 (GL_IT(it)->deco_it_view, EVAS_CALLBACK_MOUSE_MOVE, _item_mouse_move_cb, 5271 (GL_IT(it)->deco_it_view, EVAS_CALLBACK_MOUSE_MOVE, _item_mouse_move_cb,
5270 it); 5272 it);
5271 5273
5272 _view_inflate(it->item->deco_it_view, it, NULL, 5274 _view_inflate(it->item->deco_it_view, it, &GL_IT(it)->deco_it_texts,
5273 &GL_IT(it)->deco_it_contents); 5275 &GL_IT(it)->deco_it_contents);
5274 edje_object_part_swallow 5276 edje_object_part_swallow
5275 (it->item->deco_it_view, 5277 (it->item->deco_it_view,
@@ -6856,6 +6858,8 @@ _elm_genlist_item_item_class_update(Eo *eo_it, Elm_Gen_Item *it,
6856 it->item->nocache_once = EINA_TRUE; 6858 it->item->nocache_once = EINA_TRUE;
6857 6859
6858 ELM_SAFE_FREE(it->texts, elm_widget_stringlist_free); 6860 ELM_SAFE_FREE(it->texts, elm_widget_stringlist_free);
6861 ELM_SAFE_FREE(GL_IT(it)->deco_it_texts, elm_widget_stringlist_free);
6862 ELM_SAFE_FREE(GL_IT(it)->deco_all_texts, elm_widget_stringlist_free);
6859 6863
6860 elm_genlist_item_update(eo_it); 6864 elm_genlist_item_update(eo_it);
6861} 6865}
diff --git a/src/lib/elm_widget_genlist.h b/src/lib/elm_widget_genlist.h
index 477dbde04..d16c3940e 100644
--- a/src/lib/elm_widget_genlist.h
+++ b/src/lib/elm_widget_genlist.h
@@ -211,8 +211,8 @@ struct Elm_Gen_Item_Type
211 Evas_Coord w, h, minw, minh; 211 Evas_Coord w, h, minw, minh;
212 Elm_Gen_Item *group_item; 212 Elm_Gen_Item *group_item;
213 Elm_Genlist_Item_Type type; 213 Elm_Genlist_Item_Type type;
214 Eina_List *deco_it_contents; 214 Eina_List *deco_it_texts, *deco_it_contents;
215 Eina_List *deco_all_contents; 215 Eina_List *deco_all_texts, *deco_all_contents;
216 Eina_List *flip_contents; 216 Eina_List *flip_contents;
217 Ecore_Timer *swipe_timer; 217 Ecore_Timer *swipe_timer;
218 Evas_Coord scrl_x, scrl_y, old_scrl_y; 218 Evas_Coord scrl_x, scrl_y, old_scrl_y;