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 "Fix text AutoScroll ellipsis issue" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
atlas
/
atlas-manager.cpp
diff --git
a/dali-toolkit/internal/text/rendering/atlas/atlas-manager.cpp
b/dali-toolkit/internal/text/rendering/atlas/atlas-manager.cpp
index
510da05
..
b883a8c
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/atlas/atlas-manager.cpp
+++ b/
dali-toolkit/internal/text/rendering/atlas/atlas-manager.cpp
@@
-22,10
+22,8
@@
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
AtlasManager::AtlasManager()
{
}
AtlasManager::AtlasManager()
{
}
@@
-40,67
+38,67
@@
AtlasManager AtlasManager::New()
return AtlasManager(internal.Get());
}
return AtlasManager(internal.Get());
}
-AtlasManager::AtlasManager(Internal::AtlasManager
*
impl)
-
: BaseHandle(impl)
+AtlasManager::AtlasManager(Internal::AtlasManager
*
impl)
+: BaseHandle(impl)
{
}
{
}
-AtlasManager::AtlasId AtlasManager::CreateAtlas(
const AtlasManager::AtlasSize& size, Pixel::Format pixelformat
)
+AtlasManager::AtlasId AtlasManager::CreateAtlas(
const AtlasManager::AtlasSize& size, Pixel::Format pixelformat
)
{
{
- return GetImplementation(*this).CreateAtlas(
size, pixelformat
);
+ return GetImplementation(*this).CreateAtlas(
size, pixelformat
);
}
}
-void AtlasManager::SetAddPolicy(
AddFailPolicy policy
)
+void AtlasManager::SetAddPolicy(
AddFailPolicy policy
)
{
{
- GetImplementation(*this).SetAddPolicy(
policy
);
+ GetImplementation(*this).SetAddPolicy(
policy
);
}
}
-bool AtlasManager::Add(
const PixelData&
image,
-
AtlasManager::AtlasSlot& slot,
-
AtlasManager::AtlasId atlas
)
+bool AtlasManager::Add(
const PixelData&
image,
+ AtlasManager::AtlasSlot& slot,
+
AtlasManager::AtlasId atlas
)
{
{
- return GetImplementation(*this).Add(
image, slot, atlas
);
+ return GetImplementation(*this).Add(
image, slot, atlas
);
}
}
-bool AtlasManager::Remove(
ImageId id
)
+bool AtlasManager::Remove(
ImageId id
)
{
{
- return GetImplementation(*this).Remove(
id
);
+ return GetImplementation(*this).Remove(
id
);
}
}
-void AtlasManager::GenerateMeshData(
ImageId
id,
-
const Vector2& position,
-
Mesh2D&
mesh,
-
bool addReference
)
+void AtlasManager::GenerateMeshData(
ImageId
id,
+ const Vector2& position,
+
Mesh2D&
mesh,
+
bool addReference
)
{
{
- GetImplementation(*this).GenerateMeshData(
id,
-
position,
-
mesh,
-
addReference
);
+ GetImplementation(*this).GenerateMeshData(id,
+ position,
+ mesh,
+
addReference
);
}
}
-Dali::Texture AtlasManager::GetAtlasContainer(
AtlasId atlas
) const
+Dali::Texture AtlasManager::GetAtlasContainer(
AtlasId atlas
) const
{
{
- return GetImplementation(*this).GetAtlasContainer(
atlas
);
+ return GetImplementation(*this).GetAtlasContainer(
atlas
);
}
}
-AtlasManager::AtlasId AtlasManager::GetAtlas(
ImageId id
)
+AtlasManager::AtlasId AtlasManager::GetAtlas(
ImageId id
)
{
{
- return GetImplementation(*this).GetAtlas(
id
);
+ return GetImplementation(*this).GetAtlas(
id
);
}
}
-const AtlasManager::AtlasSize& AtlasManager::GetAtlasSize(
AtlasId atlas
)
+const AtlasManager::AtlasSize& AtlasManager::GetAtlasSize(
AtlasId atlas
)
{
{
- return GetImplementation(*this).GetAtlasSize(
atlas
);
+ return GetImplementation(*this).GetAtlasSize(
atlas
);
}
}
-AtlasManager::SizeType AtlasManager::GetFreeBlocks(
AtlasId atlas
)
+AtlasManager::SizeType AtlasManager::GetFreeBlocks(
AtlasId atlas
)
{
{
- return GetImplementation(*this).GetFreeBlocks(
atlas
);
+ return GetImplementation(*this).GetFreeBlocks(
atlas
);
}
}
-void AtlasManager::SetNewAtlasSize(
const AtlasSize& size
)
+void AtlasManager::SetNewAtlasSize(
const AtlasSize& size
)
{
{
- GetImplementation(*this).SetNewAtlasSize(
size
);
+ GetImplementation(*this).SetNewAtlasSize(
size
);
}
AtlasManager::SizeType AtlasManager::GetAtlasCount() const
}
AtlasManager::SizeType AtlasManager::GetAtlasCount() const
@@
-108,24
+106,24
@@
AtlasManager::SizeType AtlasManager::GetAtlasCount() const
return GetImplementation(*this).GetAtlasCount();
}
return GetImplementation(*this).GetAtlasCount();
}
-Pixel::Format AtlasManager::GetPixelFormat(
AtlasId atlas
) const
+Pixel::Format AtlasManager::GetPixelFormat(
AtlasId atlas
) const
{
{
- return GetImplementation(*this).GetPixelFormat(
atlas
);
+ return GetImplementation(*this).GetPixelFormat(
atlas
);
}
}
-void AtlasManager::GetMetrics(
Metrics& metrics
)
+void AtlasManager::GetMetrics(
Metrics& metrics
)
{
{
- GetImplementation(*this).GetMetrics(
metrics
);
+ GetImplementation(*this).GetMetrics(
metrics
);
}
}
-TextureSet AtlasManager::GetTextures(
AtlasId atlas
) const
+TextureSet AtlasManager::GetTextures(
AtlasId atlas
) const
{
{
- return GetImplementation(*this).GetTextures(
atlas
);
+ return GetImplementation(*this).GetTextures(
atlas
);
}
}
-void AtlasManager::SetTextures(
AtlasId atlas, TextureSet& textureSet
)
+void AtlasManager::SetTextures(
AtlasId atlas, TextureSet& textureSet
)
{
{
- GetImplementation(*this).SetTextures(
atlas, textureSet
);
+ GetImplementation(*this).SetTextures(
atlas, textureSet
);
}
} // namespace Toolkit
}
} // namespace Toolkit