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 "Spannable: Add UnderlineSpan" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
controller
/
text-controller-impl-model-updater.cpp
diff --git
a/dali-toolkit/internal/text/controller/text-controller-impl-model-updater.cpp
b/dali-toolkit/internal/text/controller/text-controller-impl-model-updater.cpp
index
ff4697b
..
d29ac70
100644
(file)
--- a/
dali-toolkit/internal/text/controller/text-controller-impl-model-updater.cpp
+++ b/
dali-toolkit/internal/text/controller/text-controller-impl-model-updater.cpp
@@
-387,7
+387,8
@@
bool ControllerImplModelUpdater::Update(Controller::Impl& impl, OperationsMask o
impl.mModel->mVisualModel->mUnderlineRuns.PushBack(underlineRun);
//Mark-up processor case
impl.mModel->mVisualModel->mUnderlineRuns.PushBack(underlineRun);
//Mark-up processor case
- if(impl.mModel->mVisualModel->IsMarkupProcessorEnabled())
+ if(impl.mModel->mVisualModel->IsMarkupProcessorEnabled() ||
+ impl.mModel->mLogicalModel->mUnderlineRunsUpdated)
{
impl.CopyUnderlinedFromLogicalToVisualModels(false);
}
{
impl.CopyUnderlinedFromLogicalToVisualModels(false);
}
@@
-428,7
+429,8
@@
bool ControllerImplModelUpdater::Update(Controller::Impl& impl, OperationsMask o
impl.mModel->mLogicalModel->mColorRuns.PushBack(colorRun);
//Mark-up processor case
impl.mModel->mLogicalModel->mColorRuns.PushBack(colorRun);
//Mark-up processor case
- if(impl.mModel->mVisualModel->IsMarkupProcessorEnabled())
+ if(impl.mModel->mVisualModel->IsMarkupProcessorEnabled() ||
+ impl.mModel->mLogicalModel->mUnderlineRunsUpdated)
{
impl.CopyUnderlinedFromLogicalToVisualModels(false);
}
{
impl.CopyUnderlinedFromLogicalToVisualModels(false);
}
@@
-443,7
+445,8
@@
bool ControllerImplModelUpdater::Update(Controller::Impl& impl, OperationsMask o
impl.mModel->mLogicalModel->mBackgroundColorRuns.PushBack(backgroundColorRun);
//Mark-up processor case
impl.mModel->mLogicalModel->mBackgroundColorRuns.PushBack(backgroundColorRun);
//Mark-up processor case
- if(impl.mModel->mVisualModel->IsMarkupProcessorEnabled())
+ if(impl.mModel->mVisualModel->IsMarkupProcessorEnabled() ||
+ impl.mModel->mLogicalModel->mUnderlineRunsUpdated)
{
impl.CopyUnderlinedFromLogicalToVisualModels(false);
}
{
impl.CopyUnderlinedFromLogicalToVisualModels(false);
}
@@
-464,7
+467,8
@@
bool ControllerImplModelUpdater::Update(Controller::Impl& impl, OperationsMask o
impl.mModel->mVisualModel->mUnderlineRuns.PushBack(underlineRun);
//Mark-up processor case
impl.mModel->mVisualModel->mUnderlineRuns.PushBack(underlineRun);
//Mark-up processor case
- if(impl.mModel->mVisualModel->IsMarkupProcessorEnabled())
+ if(impl.mModel->mVisualModel->IsMarkupProcessorEnabled() ||
+ impl.mModel->mLogicalModel->mUnderlineRunsUpdated)
{
impl.CopyUnderlinedFromLogicalToVisualModels(false);
}
{
impl.CopyUnderlinedFromLogicalToVisualModels(false);
}
@@
-485,7
+489,8
@@
bool ControllerImplModelUpdater::Update(Controller::Impl& impl, OperationsMask o
impl.mModel->mVisualModel->mUnderlineRuns.PushBack(underlineRun);
//Mark-up processor case
impl.mModel->mVisualModel->mUnderlineRuns.PushBack(underlineRun);
//Mark-up processor case
- if(impl.mModel->mVisualModel->IsMarkupProcessorEnabled())
+ if(impl.mModel->mVisualModel->IsMarkupProcessorEnabled() ||
+ impl.mModel->mLogicalModel->mUnderlineRunsUpdated)
{
impl.CopyUnderlinedFromLogicalToVisualModels(false);
}
{
impl.CopyUnderlinedFromLogicalToVisualModels(false);
}
@@
-506,7
+511,8
@@
bool ControllerImplModelUpdater::Update(Controller::Impl& impl, OperationsMask o
impl.mModel->mVisualModel->mUnderlineRuns.PushBack(underlineRun);
//Mark-up processor case
impl.mModel->mVisualModel->mUnderlineRuns.PushBack(underlineRun);
//Mark-up processor case
- if(impl.mModel->mVisualModel->IsMarkupProcessorEnabled())
+ if(impl.mModel->mVisualModel->IsMarkupProcessorEnabled() ||
+ impl.mModel->mLogicalModel->mUnderlineRunsUpdated)
{
impl.CopyUnderlinedFromLogicalToVisualModels(false);
}
{
impl.CopyUnderlinedFromLogicalToVisualModels(false);
}
@@
-527,7
+533,8
@@
bool ControllerImplModelUpdater::Update(Controller::Impl& impl, OperationsMask o
impl.mModel->mVisualModel->mUnderlineRuns.PushBack(underlineRun);
//Mark-up processor case
impl.mModel->mVisualModel->mUnderlineRuns.PushBack(underlineRun);
//Mark-up processor case
- if(impl.mModel->mVisualModel->IsMarkupProcessorEnabled())
+ if(impl.mModel->mVisualModel->IsMarkupProcessorEnabled() ||
+ impl.mModel->mLogicalModel->mUnderlineRunsUpdated)
{
impl.CopyUnderlinedFromLogicalToVisualModels(false);
}
{
impl.CopyUnderlinedFromLogicalToVisualModels(false);
}
@@
-575,7
+582,8
@@
bool ControllerImplModelUpdater::Update(Controller::Impl& impl, OperationsMask o
(0u != impl.mModel->mVisualModel->mCharactersToGlyph.Count())))
{
//Mark-up processor case
(0u != impl.mModel->mVisualModel->mCharactersToGlyph.Count())))
{
//Mark-up processor case
- if(impl.mModel->mVisualModel->IsMarkupProcessorEnabled())
+ if(impl.mModel->mVisualModel->IsMarkupProcessorEnabled() ||
+ impl.mModel->mLogicalModel->mUnderlineRunsUpdated)
{
impl.CopyUnderlinedFromLogicalToVisualModels(true);
impl.CopyStrikethroughFromLogicalToVisualModels();
{
impl.CopyUnderlinedFromLogicalToVisualModels(true);
impl.CopyStrikethroughFromLogicalToVisualModels();