From: Gustavo Lima Chaves Date: Tue, 10 Jul 2012 21:40:30 +0000 (+0000) Subject: [elm] Bug fixing on scroller. X-Git-Tag: v1.7.0~359 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f2ea631c4468ff6b6a851c26382c275e79e9aea0;p=platform%2Fupstream%2Felementary.git [elm] Bug fixing on scroller. We had an inconsistency of two missing getters, that would "leak" API deprecation on specialized scrollers (scrollables). Putting them in for good now. SVN revision: 73540 --- diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c index febe135..a5e7877 100644 --- a/src/lib/elm_scroller.c +++ b/src/lib/elm_scroller.c @@ -862,6 +862,17 @@ elm_scroller_page_relative_set(Evas_Object *obj, } EAPI void +elm_scroller_page_relative_get(const Evas_Object *obj, + double *h_pagerel, + double *v_pagerel) +{ + ELM_SCROLLER_CHECK(obj); + ELM_SCROLLER_DATA_GET(obj, sd); + + sd->s_iface->paging_get(obj, h_pagerel, v_pagerel, NULL, NULL); +} + +EAPI void elm_scroller_page_size_set(Evas_Object *obj, Evas_Coord h_pagesize, Evas_Coord v_pagesize) @@ -877,6 +888,17 @@ elm_scroller_page_size_set(Evas_Object *obj, } EAPI void +elm_scroller_page_size_get(const Evas_Object *obj, + Evas_Coord *h_pagesize, + Evas_Coord *v_pagesize) +{ + ELM_SCROLLER_CHECK(obj); + ELM_SCROLLER_DATA_GET(obj, sd); + + sd->s_iface->paging_get(obj, NULL, NULL, h_pagesize, v_pagesize); +} + +EAPI void elm_scroller_current_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber) diff --git a/src/lib/elm_scroller.h b/src/lib/elm_scroller.h index 447f2aa..52d796c 100644 --- a/src/lib/elm_scroller.h +++ b/src/lib/elm_scroller.h @@ -236,6 +236,22 @@ EAPI void elm_scroller_bounce_get(const Evas_Object *obj EAPI void elm_scroller_page_relative_set(Evas_Object *obj, double h_pagerel, double v_pagerel); /** + * Get a given scroller widget's scrolling page size, relative to + * its viewport size. + * + * @param obj The scroller object + * @param h_pagerel Pointer to a variable where to store the + * horizontal page (relative) size + * @param v_pagerel Pointer to a variable where to store the + * vertical page (relative) size + * + * @see elm_scroller_page_relative_set() for more details + * + * @ingroup Scroller + */ +EAPI void elm_scroller_page_relative_get(const Evas_Object *obj, double *h_pagerel, double *v_pagerel); + +/** * @brief Set scroll page size. * * @param obj The scroller object @@ -246,12 +262,27 @@ EAPI void elm_scroller_page_relative_set(Evas_Object *ob * for that axis. * * @see elm_scroller_page_relative_set() + * @see elm_scroller_page_size_get() * * @ingroup Scroller */ EAPI void elm_scroller_page_size_set(Evas_Object *obj, Evas_Coord h_pagesize, Evas_Coord v_pagesize); /** + * @brief Retrieve a scroller widget's current page size. + * + * @param obj The scroller object + * @param h_pagesize Where to store its horizontal page size + * @param v_pagesize Where to store its vertical page size + * + * @see elm_scroller_page_size_set() for more details + * @see elm_scroller_page_relative_set() + * + * @ingroup Scroller + */ +EAPI void elm_scroller_page_size_get(const Evas_Object *obj, Evas_Coord *h_pagesize, Evas_Coord *v_pagesize); + +/** * @brief Get scroll current page number. * * @param obj The scroller object