X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fscroll-view%2Fscroll-overshoot-indicator-impl.h;h=fd408aced7a5ff3718cc7e63655acee4a33b8198;hb=acd889e1216f09643136902ba7a115c2e5589418;hp=7eebe4bcdc84dda27845b7561cbd6d9b359de032;hpb=a7c0fb8e478b1efb8ae0e078e9f1af217ad887a1;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h index 7eebe4b..fd408ac 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_SCROLL_OVERSHOOT_INDICATOR_H__ -#define __DALI_TOOLKIT_INTERNAL_SCROLL_OVERSHOOT_INDICATOR_H__ +#ifndef DALI_TOOLKIT_INTERNAL_SCROLL_OVERSHOOT_INDICATOR_H +#define DALI_TOOLKIT_INTERNAL_SCROLL_OVERSHOOT_INDICATOR_H /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -251,8 +251,9 @@ private: PropertyNotification mOvershootDecreaseNotification;///< notification used to inform as overshoot decreases Property::Index mOvershootProperty; ///< index of the overshoot property in the scrollable actor Property::Index mEffectOvershootProperty; ///< index of the effect's overshoot property - float mOvershoot; ///< last overshoot value as detected by notifications - unsigned short mAnimationStateFlags; ///< contains flags indicating the current state of the overshoot animation + float mOvershoot; ///< last overshoot value as detected by notifications + Vector2 mOvershootSize; ///< The size of the overshoot effect + unsigned short mAnimationStateFlags; ///< contains flags indicating the current state of the overshoot animation }; } // namespace Internal @@ -261,4 +262,4 @@ private: } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_SCROLL_OVERSHOOT_INDICATOR_H__ +#endif // DALI_TOOLKIT_INTERNAL_SCROLL_OVERSHOOT_INDICATOR_H