X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscroll-bar%2Fscroll-bar-impl.h;h=304922701fdf6afab4ef44822b18f3580119a98a;hp=e808d83299f47c84939f98b95e11b559b5ed26de;hb=b1e8521ad77e7b4e62b59613b2edef64429130e9;hpb=667a103d2c6f9caba8c970bdafd26bdd10144715 diff --git a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h old mode 100755 new mode 100644 index e808d83..3049227 --- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h +++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_SCROLL_BAR_H /* - * Copyright (c) 2019 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. @@ -283,7 +283,7 @@ private: Toolkit::ScrollBar::Direction mDirection; ///< The direction of scroll bar (vertical or horizontal) - WeakHandleBase mScrollableObject; ///< Object to be scrolled + WeakHandle mScrollableObject; ///< Object to be scrolled Property::Index mPropertyScrollPosition; ///< Index of scroll position property owned by the object to be scrolled Property::Index mPropertyMinScrollPosition; ///< Index of minimum scroll position property owned by the object to be scrolled @@ -295,7 +295,7 @@ private: float mTransientIndicatorDuration; ///< The duration before hiding transient indicator float mScrollStart; ///< Scroll Start position (start of drag) - Vector3 mGestureDisplacement; ///< Gesture Displacement. + Vector2 mGestureDisplacement; ///< Gesture Displacement. float mCurrentScrollPosition; ///< The current scroll position updated by the pan gesture