summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2011-10-21 23:51:26 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2011-10-21 23:51:26 +0000
commit9cffa1a766a2053ed60675ca5200622e144aee44 (patch)
tree5fcd703f346817d1662d6e3521ec6da1699f3001 /legacy
parente22f36e214ba4fc82180b2f01006c002875ffca5 (diff)
add bounce settings to genlist wd
SVN revision: 64280
Diffstat (limited to 'legacy')
-rw-r--r--legacy/elementary/src/lib/elm_gengrid.c4
-rw-r--r--legacy/elementary/src/lib/elm_genlist.c9
2 files changed, 9 insertions, 4 deletions
diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c
index a3aec10592..04a4e7145e 100644
--- a/legacy/elementary/src/lib/elm_gengrid.c
+++ b/legacy/elementary/src/lib/elm_gengrid.c
@@ -59,6 +59,8 @@ struct _Widget_Data
59 Eina_Bool wasselected : 1; 59 Eina_Bool wasselected : 1;
60 Eina_Bool always_select : 1; 60 Eina_Bool always_select : 1;
61 Eina_Bool clear_me : 1; 61 Eina_Bool clear_me : 1;
62 Eina_Bool h_bounce : 1;
63 Eina_Bool v_bounce : 1;
62 Ecore_Cb del_cb, calc_cb, sizing_cb; 64 Ecore_Cb del_cb, calc_cb, sizing_cb;
63 Ecore_Cb clear_cb; 65 Ecore_Cb clear_cb;
64 //////////////////////////////////// 66 ////////////////////////////////////
@@ -71,8 +73,6 @@ struct _Widget_Data
71 73
72 Eina_Bool horizontal : 1; 74 Eina_Bool horizontal : 1;
73 Eina_Bool longpressed : 1; 75 Eina_Bool longpressed : 1;
74 Eina_Bool h_bounce : 1;
75 Eina_Bool v_bounce : 1;
76 Eina_Bool reorder_item_changed : 1; 76 Eina_Bool reorder_item_changed : 1;
77 Eina_Bool move_effect_enabled : 1; 77 Eina_Bool move_effect_enabled : 1;
78}; 78};
diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c
index 9473087ce7..3a86a41286 100644
--- a/legacy/elementary/src/lib/elm_genlist.c
+++ b/legacy/elementary/src/lib/elm_genlist.c
@@ -83,6 +83,8 @@ struct _Widget_Data
83 Eina_Bool wasselected : 1; 83 Eina_Bool wasselected : 1;
84 Eina_Bool always_select : 1; 84 Eina_Bool always_select : 1;
85 Eina_Bool clear_me : 1; 85 Eina_Bool clear_me : 1;
86 Eina_Bool h_bounce : 1;
87 Eina_Bool v_bounce : 1;
86 Ecore_Cb del_cb, calc_cb, sizing_cb; 88 Ecore_Cb del_cb, calc_cb, sizing_cb;
87 Ecore_Cb clear_cb; 89 Ecore_Cb clear_cb;
88 //////////////////////////////////// 90 ////////////////////////////////////
@@ -1323,7 +1325,7 @@ _mouse_up(void *data,
1323 edje_object_signal_emit(VIEW(it), "elm,state,reorder,disabled", "elm"); 1325 edje_object_signal_emit(VIEW(it), "elm,state,reorder,disabled", "elm");
1324 it->wd->reorder_it = it->wd->reorder_rel = NULL; 1326 it->wd->reorder_it = it->wd->reorder_rel = NULL;
1325 elm_smart_scroller_hold_set(it->wd->scr, EINA_FALSE); 1327 elm_smart_scroller_hold_set(it->wd->scr, EINA_FALSE);
1326 elm_smart_scroller_bounce_allow_set(it->wd->scr, EINA_FALSE, EINA_TRUE); 1328 elm_smart_scroller_bounce_allow_set(it->wd->scr, it->wd->h_bounce, it->wd->v_bounce);
1327 } 1329 }
1328 if (it->wd->longpressed) 1330 if (it->wd->longpressed)
1329 { 1331 {
@@ -4528,6 +4530,8 @@ elm_genlist_bounce_set(Evas_Object *obj,
4528 Widget_Data *wd = elm_widget_data_get(obj); 4530 Widget_Data *wd = elm_widget_data_get(obj);
4529 if (!wd) return; 4531 if (!wd) return;
4530 elm_smart_scroller_bounce_allow_set(wd->scr, h_bounce, v_bounce); 4532 elm_smart_scroller_bounce_allow_set(wd->scr, h_bounce, v_bounce);
4533 wd->h_bounce = h_bounce;
4534 wd->v_bounce = v_bounce;
4531} 4535}
4532 4536
4533EAPI void 4537EAPI void
@@ -4538,7 +4542,8 @@ elm_genlist_bounce_get(const Evas_Object *obj,
4538 ELM_CHECK_WIDTYPE(obj, widtype); 4542 ELM_CHECK_WIDTYPE(obj, widtype);
4539 Widget_Data *wd = elm_widget_data_get(obj); 4543 Widget_Data *wd = elm_widget_data_get(obj);
4540 if (!wd) return; 4544 if (!wd) return;
4541 elm_smart_scroller_bounce_allow_get(wd->scr, h_bounce, v_bounce); 4545 if (h_bounce) *h_bounce = wd->h_bounce;
4546 if (v_bounce) *v_bounce = wd->v_bounce;
4542} 4547}
4543 4548
4544EAPI void 4549EAPI void