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
Rendering API clean-up
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
decorator
/
text-decorator.cpp
diff --git
a/dali-toolkit/internal/text/decorator/text-decorator.cpp
b/dali-toolkit/internal/text/decorator/text-decorator.cpp
index
43ccb78
..
bb393ff
100644
(file)
--- a/
dali-toolkit/internal/text/decorator/text-decorator.cpp
+++ b/
dali-toolkit/internal/text/decorator/text-decorator.cpp
@@
-284,8
+284,7
@@
struct Decorator::Impl : public ConnectionTracker
{
mQuadVertexFormat[ "aPosition" ] = Property::VECTOR2;
mQuadIndexFormat[ "indices" ] = Property::INTEGER;
{
mQuadVertexFormat[ "aPosition" ] = Property::VECTOR2;
mQuadIndexFormat[ "indices" ] = Property::INTEGER;
- mHighlightMaterial = Material::New( Shader::New( VERTEX_SHADER, FRAGMENT_SHADER ) );
-
+ mHighlightShader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER );
SetupTouchEvents();
}
SetupTouchEvents();
}
@@
-1069,7
+1068,7
@@
struct Decorator::Impl : public ConnectionTracker
if( !mHighlightRenderer )
{
if( !mHighlightRenderer )
{
- mHighlightRenderer = Dali::Renderer::New( mQuadGeometry, mHighlight
Material
);
+ mHighlightRenderer = Dali::Renderer::New( mQuadGeometry, mHighlight
Shader
);
mHighlightActor.AddRenderer( mHighlightRenderer );
}
}
mHighlightActor.AddRenderer( mHighlightRenderer );
}
}
@@
-1653,7
+1652,7
@@
struct Decorator::Impl : public ConnectionTracker
Actor mHighlightActor; ///< Actor to display highlight
Renderer mHighlightRenderer;
Actor mHighlightActor; ///< Actor to display highlight
Renderer mHighlightRenderer;
-
Material mHighlightMaterial; ///< Material
used for highlight
+
Shader mHighlightShader; ///< Shader
used for highlight
Property::Map mQuadVertexFormat;
Property::Map mQuadIndexFormat;
PopupImpl mCopyPastePopup;
Property::Map mQuadVertexFormat;
Property::Map mQuadIndexFormat;
PopupImpl mCopyPastePopup;