From 041c357835c719f7d6210aa7c694b826fd331283 Mon Sep 17 00:00:00 2001 From: seoz Date: Mon, 29 Aug 2011 16:30:14 +0000 Subject: [PATCH] elm: Refactoring. Modified elm_{widget}_scroller_policy_set() API. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@62957 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/elm_diskselector.c | 9 +++++---- src/lib/elm_genlist.c | 5 ++--- src/lib/elm_scroller.c | 12 ++++-------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c index 5096b0d..5356c59 100644 --- a/src/lib/elm_diskselector.c +++ b/src/lib/elm_diskselector.c @@ -964,10 +964,11 @@ elm_diskselector_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy polic { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - if ((policy_h >= 3) || (policy_v >= 3)) return; - if (wd->scroller) - elm_smart_scroller_policy_set(wd->scroller, policy_h, policy_v); + if ((!wd) || (!wd->scroller)) return; + if ((policy_h >= ELM_SCROLLER_POLICY_LAST) || + (policy_v >= ELM_SCROLLER_POLICY_LAST)) + return; + elm_smart_scroller_policy_set(wd->scroller, policy_h, policy_v); } EAPI void diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c index 489880c..a127385 100644 --- a/src/lib/elm_genlist.c +++ b/src/lib/elm_genlist.c @@ -4756,12 +4756,11 @@ elm_genlist_scroller_policy_set(Evas_Object *obj, { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; + if ((!wd) || (!wd->scr)) return; if ((policy_h >= ELM_SCROLLER_POLICY_LAST) || (policy_v >= ELM_SCROLLER_POLICY_LAST)) return; - if (wd->scr) - elm_smart_scroller_policy_set(wd->scr, policy_h, policy_v); + elm_smart_scroller_policy_set(wd->scr, policy_h, policy_v); } EAPI void diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c index adb1f40..a4de284 100644 --- a/src/lib/elm_scroller.c +++ b/src/lib/elm_scroller.c @@ -568,15 +568,11 @@ elm_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scro { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); - const Elm_Scroller_Policy map[3] = - { - ELM_SMART_SCROLLER_POLICY_AUTO, - ELM_SMART_SCROLLER_POLICY_ON, - ELM_SMART_SCROLLER_POLICY_OFF - }; if ((!wd) || (!wd->scr)) return; - if ((policy_h >= 3) || (policy_v >= 3)) return; - elm_smart_scroller_policy_set(wd->scr, map[policy_h], map[policy_v]); + if ((policy_h >= ELM_SCROLLER_POLICY_LAST) || + (policy_v >= ELM_SCROLLER_POLICY_LAST)) + return; + elm_smart_scroller_policy_set(wd->scr, policy_h, policy_v); } EAPI void -- 2.7.4