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 remote-tracking branch 'origin/tizen' into new_text
[platform/core/uifw/dali-toolkit.git]
/
optional
/
dali-toolkit
/
internal
/
controls
/
navigation-frame
/
navigation-control-impl.cpp
diff --git
a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp
b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp
index
6ac4c6f
..
8ef5ec6
100644
(file)
--- a/
optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp
+++ b/
optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp
@@
-278,7
+278,7
@@
Layer NavigationControl::GetBarLayer() const
return mBarLayer;
}
-void NavigationControl::OnRela
idOut( Vector2
size, ActorSizeContainer& container )
+void NavigationControl::OnRela
yout( const Vector2&
size, ActorSizeContainer& container )
{
const Vector2 setSize( size );