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 "Fixed Control and Magnifier API" into tizen
[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
85d6cba
..
e46eb1d
100644
(file)
--- a/
dali-toolkit/internal/atlas-manager/atlas-manager.cpp
+++ b/
dali-toolkit/internal/atlas-manager/atlas-manager.cpp
@@
-45,13
+45,9
@@
AtlasManager::AtlasManager(Internal::AtlasManager *impl)
{
}
{
}
-AtlasManager::AtlasId AtlasManager::CreateAtlas( SizeType width,
- SizeType height,
- SizeType blockWidth,
- SizeType blockHeight,
- Pixel::Format pixelformat )
+AtlasManager::AtlasId AtlasManager::CreateAtlas( const AtlasManager::AtlasSize& size, Pixel::Format pixelformat )
{
{
- return GetImplementation(*this).CreateAtlas(
width, height, blockWidth, blockHeight
, pixelformat );
+ return GetImplementation(*this).CreateAtlas(
size
, pixelformat );
}
void AtlasManager::SetAddPolicy( AddFailPolicy policy )
}
void AtlasManager::SetAddPolicy( AddFailPolicy policy )
@@
-105,9
+101,9
@@
AtlasManager::AtlasId AtlasManager::GetAtlas( ImageId id )
return GetImplementation(*this).GetAtlas( id );
}
return GetImplementation(*this).GetAtlas( id );
}
-
Vector2 AtlasManager::GetBlock
Size( AtlasId atlas )
+
const AtlasManager::AtlasSize& AtlasManager::GetAtlas
Size( AtlasId atlas )
{
{
- return GetImplementation(*this).Get
Block
Size( atlas );
+ return GetImplementation(*this).Get
Atlas
Size( atlas );
}
AtlasManager::SizeType AtlasManager::GetFreeBlocks( AtlasId atlas )
}
AtlasManager::SizeType AtlasManager::GetFreeBlocks( AtlasId atlas )
@@
-115,10
+111,9
@@
AtlasManager::SizeType AtlasManager::GetFreeBlocks( AtlasId atlas )
return GetImplementation(*this).GetFreeBlocks( atlas );
}
return GetImplementation(*this).GetFreeBlocks( atlas );
}
-void AtlasManager::SetAtlasSize( const Vector2& size,
- const Vector2& blockSize )
+void AtlasManager::SetNewAtlasSize( const AtlasSize& size )
{
{
- GetImplementation(*this).Set
AtlasSize( size, blockS
ize );
+ GetImplementation(*this).Set
NewAtlasSize( s
ize );
}
AtlasManager::SizeType AtlasManager::GetAtlasCount() const
}
AtlasManager::SizeType AtlasManager::GetAtlasCount() const
@@
-131,6
+126,11
@@
Pixel::Format AtlasManager::GetPixelFormat( AtlasId atlas )
return GetImplementation(*this).GetPixelFormat( atlas );
}
return GetImplementation(*this).GetPixelFormat( atlas );
}
+void AtlasManager::GetMetrics( Metrics& metrics )
+{
+ return GetImplementation(*this).GetMetrics( metrics );
+}
+
} // namespace Toolkit
} // namespace Dali
} // namespace Toolkit
} // namespace Dali