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
Merge "Added style names for images and text labels of Slider" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
slider
/
slider-impl.h
diff --git
a/dali-toolkit/internal/controls/slider/slider-impl.h
b/dali-toolkit/internal/controls/slider/slider-impl.h
index
acc7494
..
7879f37
100755
(executable)
--- a/
dali-toolkit/internal/controls/slider/slider-impl.h
+++ b/
dali-toolkit/internal/controls/slider/slider-impl.h
@@
-286,6
+286,12
@@
protected:
*/
virtual void OnSizeSet( const Vector3& size );
*/
virtual void OnSizeSet( const Vector3& size );
+ /**
+ * @copydoc CustomActorImpl::OnRelayout
+ */
+ virtual void OnRelayout( const Vector2& size, RelayoutContainer& container );
+
+
private:
/**
private:
/**
@@
-324,13
+330,13
@@
private:
virtual void OnInitialize();
/**
virtual void OnInitialize();
/**
- * Hit region touch
event
+ * Hit region touch
*
* @param[in] actor The actor the event is raised for
*
* @param[in] actor The actor the event is raised for
- * @param[in]
event The touch event
info
- * @return If t
he event
is handled or not
+ * @param[in]
touch The touch
info
+ * @return If t
ouch
is handled or not
*/
*/
- bool OnTouch
Event( Actor actor, const TouchEvent& event
);
+ bool OnTouch
( Actor actor, const TouchData& touch
);
/**
* Pan gesture event
/**
* Pan gesture event