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 "Stop setting crazy Z value with controls (at the moment depth is ignored by...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
atlas
/
atlas-glyph-manager.cpp
diff --git
a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp
b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp
index
7292012
..
463a3e8
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp
+++ b/
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp
@@
-22,7
+22,6
@@
#include <dali/devel-api/adaptor-framework/singleton-service.h>
// INTERNAL INCLUDES
#include <dali/devel-api/adaptor-framework/singleton-service.h>
// INTERNAL INCLUDES
-#include <dali-toolkit/internal/atlas-manager/atlas-manager-impl.h>
#include <dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h>
namespace Dali
#include <dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h>
namespace Dali
@@
-91,11
+90,11
@@
void AtlasGlyphManager::StitchMesh( Toolkit::AtlasManager::Mesh2D& first,
GetImplementation(*this).StitchMesh( first, second );
}
GetImplementation(*this).StitchMesh( first, second );
}
-
void
AtlasGlyphManager::Cached( Text::FontId fontId,
+
bool
AtlasGlyphManager::Cached( Text::FontId fontId,
Text::GlyphIndex index,
AtlasManager::AtlasSlot& slot )
{
Text::GlyphIndex index,
AtlasManager::AtlasSlot& slot )
{
- GetImplementation(*this).Cached( fontId, index, slot );
+
return
GetImplementation(*this).Cached( fontId, index, slot );
}
void AtlasGlyphManager::SetNewAtlasSize( uint32_t width, uint32_t height, uint32_t blockWidth, uint32_t blockHeight )
}
void AtlasGlyphManager::SetNewAtlasSize( uint32_t width, uint32_t height, uint32_t blockWidth, uint32_t blockHeight )
@@
-108,11
+107,6
@@
Vector2 AtlasGlyphManager::GetAtlasSize( uint32_t atlasId )
return GetImplementation(*this).GetAtlasSize( atlasId );
}
return GetImplementation(*this).GetAtlasSize( atlasId );
}
-void AtlasGlyphManager::Remove( uint32_t imageId )
-{
- GetImplementation(*this).Remove( imageId );
-}
-
Pixel::Format AtlasGlyphManager::GetPixelFormat( uint32_t atlasId )
{
return GetImplementation(*this).GetPixelFormat( atlasId );
Pixel::Format AtlasGlyphManager::GetPixelFormat( uint32_t atlasId )
{
return GetImplementation(*this).GetPixelFormat( atlasId );
@@
-133,6
+127,11
@@
const Toolkit::AtlasGlyphManager::Metrics& AtlasGlyphManager::GetMetrics()
return GetImplementation(*this).GetMetrics();
}
return GetImplementation(*this).GetMetrics();
}
+void AtlasGlyphManager::AdjustReferenceCount( Text::FontId fontId, Text::GlyphIndex index, int32_t delta )
+{
+ GetImplementation(*this).AdjustReferenceCount( fontId, index, delta );
+}
+
Shader AtlasGlyphManager::GetEffectBufferShader() const
{
return GetImplementation(*this).GetEffectBufferShader();
Shader AtlasGlyphManager::GetEffectBufferShader() const
{
return GetImplementation(*this).GetEffectBufferShader();