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
TextField and TextLabel not to ApplyStyle if Font size or family already set
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
effects-view
/
effects-view-impl.h
diff --git
a/dali-toolkit/internal/controls/effects-view/effects-view-impl.h
b/dali-toolkit/internal/controls/effects-view/effects-view-impl.h
index
1ee381b
..
a39a1f7
100644
(file)
--- a/
dali-toolkit/internal/controls/effects-view/effects-view-impl.h
+++ b/
dali-toolkit/internal/controls/effects-view/effects-view-impl.h
@@
-133,9
+133,9
@@
private: // From Control
virtual void OnInitialize();
/**
virtual void OnInitialize();
/**
- * @copydoc
Toolkit::Control::OnControl
SizeSet( const Vector3& targetSize )
+ * @copydoc
CustomActorImpl::On
SizeSet( const Vector3& targetSize )
*/
*/
- virtual void On
Control
SizeSet( const Vector3& targetSize );
+ virtual void OnSizeSet( const Vector3& targetSize );
private:
private: