elm: Refactoring. Modified elm_{widget}_scroller_policy_set() API.

SVN revision: 62957
This commit is contained in:
Daniel Juyung Seo 2011-08-29 16:30:14 +00:00
parent 12f074553c
commit 9e23119e41
3 changed files with 11 additions and 15 deletions

View File

@ -964,10 +964,11 @@ elm_diskselector_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy polic
{ {
ELM_CHECK_WIDTYPE(obj, widtype); ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return; if ((!wd) || (!wd->scroller)) return;
if ((policy_h >= 3) || (policy_v >= 3)) return; if ((policy_h >= ELM_SCROLLER_POLICY_LAST) ||
if (wd->scroller) (policy_v >= ELM_SCROLLER_POLICY_LAST))
elm_smart_scroller_policy_set(wd->scroller, policy_h, policy_v); return;
elm_smart_scroller_policy_set(wd->scroller, policy_h, policy_v);
} }
EAPI void EAPI void

View File

@ -4756,12 +4756,11 @@ elm_genlist_scroller_policy_set(Evas_Object *obj,
{ {
ELM_CHECK_WIDTYPE(obj, widtype); ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return; if ((!wd) || (!wd->scr)) return;
if ((policy_h >= ELM_SCROLLER_POLICY_LAST) || if ((policy_h >= ELM_SCROLLER_POLICY_LAST) ||
(policy_v >= ELM_SCROLLER_POLICY_LAST)) (policy_v >= ELM_SCROLLER_POLICY_LAST))
return; 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 EAPI void

View File

@ -568,15 +568,11 @@ elm_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scro
{ {
ELM_CHECK_WIDTYPE(obj, widtype); ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj); 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 ((!wd) || (!wd->scr)) return;
if ((policy_h >= 3) || (policy_v >= 3)) return; if ((policy_h >= ELM_SCROLLER_POLICY_LAST) ||
elm_smart_scroller_policy_set(wd->scr, map[policy_h], map[policy_v]); (policy_v >= ELM_SCROLLER_POLICY_LAST))
return;
elm_smart_scroller_policy_set(wd->scr, policy_h, policy_v);
} }
EAPI void EAPI void