projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Using New Constraints
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
scroll-bar
/
scroll-bar-impl.h
diff --git
a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
index
6979c52
..
f6e85dd
100755
(executable)
--- a/
dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
+++ b/
dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
@@
-21,7
+21,7
@@
// EXTERNAL INCLUDES
#include <dali/public-api/adaptor-framework/timer.h>
#include <dali/public-api/actors/image-actor.h>
// EXTERNAL INCLUDES
#include <dali/public-api/adaptor-framework/timer.h>
#include <dali/public-api/actors/image-actor.h>
-#include <dali/public-api/animation/
active-
constraint.h>
+#include <dali/public-api/animation/constraint.h>
#include <dali/public-api/animation/animation.h>
#include <dali/public-api/object/property-notification.h>
#include <dali/public-api/animation/animation.h>
#include <dali/public-api/object/property-notification.h>
@@
-52,13
+52,6
@@
class ScrollBar : public ScrollComponentImpl
public:
public:
- // Properties
- enum
- {
- SCROLLBAR_PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,
- SCROLLBAR_PROPERTY_END_INDEX = SCROLLBAR_PROPERTY_START_INDEX + 1000 ///< Reserving 1000 property indices
- };
-
// Signals
typedef Toolkit::ScrollBar::ScrollPositionNotifiedSignalType ScrollPositionNotifiedSignalType;
// Signals
typedef Toolkit::ScrollBar::ScrollPositionNotifiedSignalType ScrollPositionNotifiedSignalType;
@@
-265,8
+258,7
@@
private:
ScrollPositionNotifiedSignalType mScrollPositionNotifiedSignal;
ScrollPositionNotifiedSignalType mScrollPositionNotifiedSignal;
- ActiveConstraint mIndicatorSizeConstraint;
- ActiveConstraint mIndicatorPositionConstraint;
+ Constraint mIndicatorPositionConstraint;
};
} // namespace Internal
};
} // namespace Internal