X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fscroll-view%2Fscroll-view-impl.h;h=2bda8c8efe45a84a1fc58337384f16574990bdd6;hp=ab5f862f67ded69c8996f457d0e97f0ac92747b0;hb=8a647e87a01c5c78451653c1264a9eea81ac9b20;hpb=0f5a8aaa14ccf06aee1069ef585d83b8506dd099 diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h index ab5f862..2bda8c8 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_H__ -#define __DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_H__ +#ifndef DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_H +#define DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_H /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,11 +22,11 @@ #include #include #include -#include +#include // INTERNAL INCLUDES #include -#include +#include #include #include #include @@ -369,13 +369,13 @@ public: * @copydoc ScrollTo(const Vector2&) */ void TransformTo(const Vector2& position, - DirectionBias horizontalBias = DirectionBiasNone, DirectionBias verticalBias = DirectionBiasNone); + DirectionBias horizontalBias = DIRECTION_BIAS_NONE, DirectionBias verticalBias = DIRECTION_BIAS_NONE); /** * @copydoc ScrollTo(const Vector2&, float, AlhpaFunction, DirectionBias, DirectionBias) */ void TransformTo(const Vector2& position, float duration, AlphaFunction alpha, - DirectionBias horizontalBias = DirectionBiasNone, DirectionBias verticalBias = DirectionBiasNone); + DirectionBias horizontalBias = DIRECTION_BIAS_NONE, DirectionBias verticalBias = DIRECTION_BIAS_NONE); /** * @copydoc Toolkit::ScrollView::ScrollTo(const Vector2 &position) @@ -412,7 +412,7 @@ public: /** * @copydoc Toolkit::ScrollView::ScrollTo(unsigned int page, float duration, DirectionBias bias) */ - void ScrollTo(unsigned int page, float duration, DirectionBias bias = DirectionBiasNone); + void ScrollTo(unsigned int page, float duration, DirectionBias bias = DIRECTION_BIAS_NONE); /** * @copydoc Toolkit::ScrollView::ScrollTo(Actor& actor) @@ -482,8 +482,8 @@ public: */ bool AnimateTo(const Vector2& position, const Vector2& positionDuration, AlphaFunction alpha, bool findShortcuts = true, - DirectionBias horizontalBias = DirectionBiasNone, DirectionBias verticalBias = DirectionBiasNone, - SnapType snapType = Snap); + DirectionBias horizontalBias = DIRECTION_BIAS_NONE, DirectionBias verticalBias = DIRECTION_BIAS_NONE, + SnapType snapType = SNAP); /** * @copydoc Toolkit::Scrollable::AddOverlay() @@ -546,56 +546,57 @@ private: // private overridden functions from CustomActorImpl and Controls /** * @copydoc Dali::CustomActorImpl::OnSizeAnimation(Animation&, const Vector3&) */ - virtual void OnSizeAnimation(Animation& animation, const Vector3& targetSize); + void OnSizeAnimation(Animation& animation, const Vector3& targetSize) override; /** * @copydoc CustomActorImpl::OnSizeSet(const Vector3&) */ - virtual void OnSizeSet( const Vector3& size ); + void OnSizeSet( const Vector3& size ) override; /** * From CustomActorImpl; called after a child has been added to the owning actor. * @param[in] child The child which has been added. */ - virtual void OnChildAdd(Actor& child); + void OnChildAdd(Actor& child) override; /** * From CustomActorImpl; called shortly before a child is removed from the owning actor. * @param[in] child The child being removed. */ - virtual void OnChildRemove(Actor& child); + void OnChildRemove(Actor& child) override; /** - * From CustomActorImpl; called after a wheelEvent is received by the owning actor. + * Called after a wheelEvent is received by the owning actor. + * @param[in] actor Actor associated with the event. * @param[in] event The wheel event. * @return True if the event should be consumed. */ - virtual bool OnWheelEvent(const WheelEvent& event); + bool OnWheelEvent(Actor actor, const WheelEvent& event); /** * @copydoc Toolkit::Control::OnInitialize() */ - virtual void OnInitialize(); + void OnInitialize() override; /** - * @copydoc CustomActorImpl::OnStageConnection() + * @copydoc CustomActorImpl::OnSceneConnection() */ - virtual void OnStageConnection( int depth ); + void OnSceneConnection( int depth ) override; /** - * @copydoc CustomActorImpl::OnStageDisconnection() + * @copydoc CustomActorImpl::OnSceneDisconnection() */ - virtual void OnStageDisconnection(); + void OnSceneDisconnection() override; /** * @copydoc Toolkit::Control::OnAccessibilityPan() */ - virtual bool OnAccessibilityPan(PanGesture gesture); + bool OnAccessibilityPan(PanGesture gesture) override; /** * @copydoc Toolkit::Scrollable::EnableScrollOvershoot() */ - virtual void EnableScrollOvershoot(bool enable); + void EnableScrollOvershoot(bool enable) override; private: @@ -608,7 +609,7 @@ private: * @param[in] touch The touch information. * @return True if the event should be consumed. */ - bool OnTouch( Actor actor, const TouchData& touch ); + bool OnTouch( Actor actor, const TouchEvent& touch ); /** * Start a timer which calls OnTouchDownTimeout() @@ -724,7 +725,7 @@ private: * * @param[in] gesture The gesture event. */ - void OnGestureEx(Gesture::State state); + void OnGestureEx(GestureState state); /** * Performs snapping while taking into account Velocity of gesture @@ -819,7 +820,7 @@ private: * * @param[in] child The actor to be unbound. */ - virtual void FindAndUnbindActor(Actor child); + void FindAndUnbindActor(Actor child) override; /** * Gets position property. @@ -993,4 +994,4 @@ inline const Toolkit::Internal::ScrollView& GetImpl(const Toolkit::ScrollView& s } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_H__ +#endif // DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_H