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
Fixes the change of style when the text-field grabs the keyboard focus.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
atlas-manager
/
atlas-manager.cpp
diff --git
a/dali-toolkit/internal/atlas-manager/atlas-manager.cpp
b/dali-toolkit/internal/atlas-manager/atlas-manager.cpp
index
e6b041c
..
849b27d
100644
(file)
--- a/
dali-toolkit/internal/atlas-manager/atlas-manager.cpp
+++ b/
dali-toolkit/internal/atlas-manager/atlas-manager.cpp
@@
-85,14
+85,6
@@
void AtlasManager::StitchMesh( Mesh2D& first,
GetImplementation(*this).StitchMesh( first, second, optimize );
}
GetImplementation(*this).StitchMesh( first, second, optimize );
}
-void AtlasManager::StitchMesh( const Mesh2D& first,
- const Mesh2D& second,
- Mesh2D& out,
- bool optimize )
-{
- GetImplementation(*this).StitchMesh( first, second, out, optimize );
-}
-
Dali::Atlas AtlasManager::GetAtlasContainer( AtlasId atlas ) const
{
return GetImplementation(*this).GetAtlasContainer( atlas );
Dali::Atlas AtlasManager::GetAtlasContainer( AtlasId atlas ) const
{
return GetImplementation(*this).GetAtlasContainer( atlas );