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
Text::Controller - Fix a crash when the point size property is changed in a text...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-controller-impl.cpp
diff --git
a/dali-toolkit/internal/text/text-controller-impl.cpp
b/dali-toolkit/internal/text/text-controller-impl.cpp
index
d863268
..
c3b2346
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller-impl.cpp
+++ b/
dali-toolkit/internal/text/text-controller-impl.cpp
@@
-655,7
+655,7
@@
bool Controller::Impl::UpdateModel( OperationsMask operationsRequired )
if( mTextUpdateInfo.mClearAll ||
( 0u != paragraphCharacters ) )
{
if( mTextUpdateInfo.mClearAll ||
( 0u != paragraphCharacters ) )
{
- ClearModelData( startIndex, startIndex + ( ( paragraphCharacters > 0u ) ? paragraphCharacters - 1u : 0u ), operations
Required
);
+ ClearModelData( startIndex, startIndex + ( ( paragraphCharacters > 0u ) ? paragraphCharacters - 1u : 0u ), operations );
}
mTextUpdateInfo.mClearAll = false;
}
mTextUpdateInfo.mClearAll = false;
@@
-833,7
+833,7
@@
bool Controller::Impl::UpdateModel( OperationsMask operationsRequired )
updated = true;
}
updated = true;
}
- if( NO_OPERATION != ( COLOR & operations
Required
) )
+ if( NO_OPERATION != ( COLOR & operations ) )
{
// Set the color runs in glyphs.
SetColorSegmentationInfo( mLogicalModel->mColorRuns,
{
// Set the color runs in glyphs.
SetColorSegmentationInfo( mLogicalModel->mColorRuns,