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
TextDecorator. Do not destroy the highlight geometry every OnRelayout.
[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
49fe080
..
2eacef4
100644
(file)
--- a/
dali-toolkit/internal/text/decorator/text-decorator.cpp
+++ b/
dali-toolkit/internal/text/decorator/text-decorator.cpp
@@
-805,24
+805,25
@@
struct Decorator::Impl : public ConnectionTracker
mQuadVertices.SetData( &vertices[ 0 ] );
mQuadIndices.SetData( &indices[ 0 ] );
mQuadVertices.SetData( &vertices[ 0 ] );
mQuadIndices.SetData( &indices[ 0 ] );
- mQuadGeometry = Geometry::New();
- mQuadGeometry.AddVertexBuffer( mQuadVertices );
- mQuadGeometry.SetIndexBuffer( mQuadIndices );
-
- if( mHighlightRenderer )
+ if( !mQuadGeometry )
{
{
- mHighlightRenderer.SetGeometry( mQuadGeometry );
+ mQuadGeometry = Geometry::New();
+ mQuadGeometry.AddVertexBuffer( mQuadVertices );
}
}
- else
+ mQuadGeometry.SetIndexBuffer( mQuadIndices );
+
+ if( !mHighlightRenderer )
{
mHighlightRenderer = Dali::Renderer::New( mQuadGeometry, mHighlightMaterial );
mHighlightActor.AddRenderer( mHighlightRenderer );
}
{
mHighlightRenderer = Dali::Renderer::New( mQuadGeometry, mHighlightMaterial );
mHighlightActor.AddRenderer( mHighlightRenderer );
}
-
- mHighlightActor.SetPosition( mHighlightPosition.x,
- mHighlightPosition.y );
}
}
+ mHighlightActor.SetPosition( mHighlightPosition.x,
+ mHighlightPosition.y );
+
+ mHighlightQuadList.clear();
+
mHighlightRenderer.SetDepthIndex( mTextDepth - 2u ); // text is rendered at mTextDepth and text's shadow at mTextDepth -1u.
}
}
mHighlightRenderer.SetDepthIndex( mTextDepth - 2u ); // text is rendered at mTextDepth and text's shadow at mTextDepth -1u.
}
}