From 2d1e97bca50a1cee66cd22465ef6d2d2f0d0771d Mon Sep 17 00:00:00 2001 From: antognolli Date: Fri, 22 Jul 2011 17:15:33 +0000 Subject: [PATCH] elm/genlist - Fix bounce option getter. Try to get the bounce option from the internal els_scroller, and also add checks on the els_scroller api to see if the arguments were given. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@61592 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/elm_genlist.c | 2 +- src/lib/els_scroller.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c index c4137cd..305d40c 100644 --- a/src/lib/elm_genlist.c +++ b/src/lib/elm_genlist.c @@ -5474,7 +5474,7 @@ elm_genlist_bounce_get(const Evas_Object *obj, ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; - elm_smart_scroller_bounce_allow_get(obj, h_bounce, v_bounce); + elm_smart_scroller_bounce_allow_get(wd->scr, h_bounce, v_bounce); } /** diff --git a/src/lib/els_scroller.c b/src/lib/els_scroller.c index 5ccdaad..26028b2 100644 --- a/src/lib/els_scroller.c +++ b/src/lib/els_scroller.c @@ -1277,8 +1277,8 @@ void elm_smart_scroller_bounce_allow_get(const Evas_Object *obj, Eina_Bool *horiz, Eina_Bool *vert) { API_ENTRY return; - *horiz = sd->bounce_horiz; - *vert = sd->bounce_vert; + if (horiz) *horiz = sd->bounce_horiz; + if (vert) *vert = sd->bounce_vert; } void -- 2.7.4