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 "Change KeyboardFocusManager to always focus when SetCurrentFocus is called...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
text-backend-impl.cpp
diff --git
a/dali-toolkit/internal/text/rendering/text-backend-impl.cpp
b/dali-toolkit/internal/text/rendering/text-backend-impl.cpp
index
74b80f1
..
776d408
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/text-backend-impl.cpp
+++ b/
dali-toolkit/internal/text/rendering/text-backend-impl.cpp
@@
-19,11
+19,12
@@
#include <dali-toolkit/internal/text/rendering/text-backend-impl.h>
// EXTERNAL INCLUDES
#include <dali-toolkit/internal/text/rendering/text-backend-impl.h>
// EXTERNAL INCLUDES
-#include <dali/public-api/adaptor-framework/singleton-service.h>
#include <dali/integration-api/debug.h>
#include <dali/integration-api/debug.h>
+#include <dali/devel-api/adaptor-framework/singleton-service.h>
// INTERNAL INCLUDES
// INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/rendering/basic/text-basic-renderer.h>
+#include <dali-toolkit/public-api/text/rendering-backend.h>
+#include <dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.h>
namespace Dali
{
namespace Dali
{
@@
-84,15
+85,9
@@
RendererPtr Backend::NewRenderer( unsigned int renderingType )
switch( renderingType )
{
switch( renderingType )
{
- case Dali::Toolkit::Text::RENDERING_BASIC:
- {
- renderer = Dali::Toolkit::Text::BasicRenderer::New();
- }
- break;
-
case Dali::Toolkit::Text::RENDERING_SHARED_ATLAS:
{
case Dali::Toolkit::Text::RENDERING_SHARED_ATLAS:
{
- // TODO
+ renderer = Dali::Toolkit::Text::AtlasRenderer::New();
}
break;
}
break;