diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog index e9072c2085..3f5c89aad0 100644 --- a/legacy/elementary/ChangeLog +++ b/legacy/elementary/ChangeLog @@ -162,3 +162,7 @@ * Toolbar: Remove the APIs elm_toolbar_items_max_set/get. Instead of them, add the APIs elm_toolbar_standard_priority_set/get. The items which are lower than standard priority are located in more menu or panel. + +2012-06-08 Jaehwan Kim + + * Add elm_object_scroll_hold/freeze_get. diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS index 7d8ec5b94f..ebcefac253 100644 --- a/legacy/elementary/NEWS +++ b/legacy/elementary/NEWS @@ -10,6 +10,7 @@ Additions: * Fileselector: Add a wheel spinner that show/spin while EIO is working * Add elm_map_overlays_get & elm_map_overlay_visible_get functions. * Toolbar: Add elm_toolbar_standard_priority_set/get APIs. + * Add elm_object_scroll_hold/freeze_get. Fixes: diff --git a/legacy/elementary/src/lib/elm_main.c b/legacy/elementary/src/lib/elm_main.c index 5a459b6d99..ca45f60937 100644 --- a/legacy/elementary/src/lib/elm_main.c +++ b/legacy/elementary/src/lib/elm_main.c @@ -1169,6 +1169,13 @@ elm_object_scroll_hold_pop(Evas_Object *obj) elm_widget_scroll_hold_pop(obj); } +EAPI int +elm_object_scroll_hold_get(const Evas_Object *obj) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(obj, 0); + elm_widget_scroll_hold_get(obj); +} + EAPI void elm_object_scroll_freeze_push(Evas_Object *obj) { @@ -1176,6 +1183,20 @@ elm_object_scroll_freeze_push(Evas_Object *obj) elm_widget_scroll_freeze_push(obj); } +EAPI void +elm_object_scroll_freeze_pop(Evas_Object *obj) +{ + EINA_SAFETY_ON_NULL_RETURN(obj); + elm_widget_scroll_freeze_pop(obj); +} + +EAPI int +elm_object_scroll_freeze_get(const Evas_Object *obj) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(obj, 0); + elm_widget_scroll_freeze_get(obj); +} + EAPI void elm_object_scroll_lock_x_set(Evas_Object *obj, Eina_Bool lock) @@ -1206,13 +1227,6 @@ elm_object_scroll_lock_y_get(const Evas_Object *obj) return elm_widget_drag_lock_y_get(obj); } -EAPI void -elm_object_scroll_freeze_pop(Evas_Object *obj) -{ - EINA_SAFETY_ON_NULL_RETURN(obj); - elm_widget_scroll_freeze_pop(obj); -} - EAPI Eina_Bool elm_object_widget_check(const Evas_Object *obj) { diff --git a/legacy/elementary/src/lib/elm_scroll.h b/legacy/elementary/src/lib/elm_scroll.h index 51a2d4fc49..9e906ed644 100644 --- a/legacy/elementary/src/lib/elm_scroll.h +++ b/legacy/elementary/src/lib/elm_scroll.h @@ -41,6 +41,18 @@ EAPI void elm_object_scroll_hold_push(Evas_Object *obj); */ EAPI void elm_object_scroll_hold_pop(Evas_Object *obj); +/** + * Get the scroll hold by 1 + * + * This gets the scroll hold count by one. + * + * @param obj The object + * @return The scroll hold count + * @since 1.1.0 + * @ingroup Scrollhints + */ +EAPI int elm_object_scroll_hold_get(const Evas_Object *obj); + /** * Push the scroll freeze by 1 * @@ -65,6 +77,18 @@ EAPI void elm_object_scroll_freeze_push(Evas_Object *obj); */ EAPI void elm_object_scroll_freeze_pop(Evas_Object *obj); +/** + * Get the scroll freeze by 1 + * + * This gets the scroll freeze count by one. + * + * @param obj The object + * @return The scroll freeze count + * @since 1.1.0 + * @ingroup Scrollhints + */ +EAPI int elm_object_scroll_freeze_get(const Evas_Object *obj); + /** * Lock the scrolling of the given widget (and thus all parents) *