X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-controller-impl-model-updater.cpp;h=de18e8537a1b7e978ec5f41f4e6188cef34d7e2f;hb=702cdc29b907688eef62afbc63f0edb9e2dfb7d2;hp=bd93e68e46b44eacbfac0b1f25a7bb4635cf31f5;hpb=9c26b8bf8e9f8bc74f809a6ffd2ac2208125bc03;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/text/text-controller-impl-model-updater.cpp b/dali-toolkit/internal/text/text-controller-impl-model-updater.cpp
index bd93e68..de18e85 100644
--- a/dali-toolkit/internal/text/text-controller-impl-model-updater.cpp
+++ b/dali-toolkit/internal/text/text-controller-impl-model-updater.cpp
@@ -374,9 +374,9 @@ bool ControllerImplModelUpdater::Update(Controller::Impl& impl, OperationsMask o
         case Dali::InputMethodContext::PreeditStyle::UNDERLINE:
         {
           // Add the underline for the pre-edit text.
-          GlyphRun underlineRun;
-          underlineRun.glyphIndex     = attrData.startIndex + numberOfCommit;
-          underlineRun.numberOfGlyphs = numberOfIndices;
+          UnderlinedGlyphRun underlineRun;
+          underlineRun.glyphRun.glyphIndex     = attrData.startIndex + numberOfCommit;
+          underlineRun.glyphRun.numberOfGlyphs = numberOfIndices;
           impl.mModel->mVisualModel->mUnderlineRuns.PushBack(underlineRun);
 
           //Mark-up processor case
@@ -451,9 +451,9 @@ bool ControllerImplModelUpdater::Update(Controller::Impl& impl, OperationsMask o
           backgroundColorRun.color                           = BACKGROUND_SUB4;
           impl.mModel->mLogicalModel->mBackgroundColorRuns.PushBack(backgroundColorRun);
 
-          GlyphRun underlineRun;
-          underlineRun.glyphIndex     = attrData.startIndex + numberOfCommit;
-          underlineRun.numberOfGlyphs = numberOfIndices;
+          UnderlinedGlyphRun underlineRun;
+          underlineRun.glyphRun.glyphIndex     = attrData.startIndex + numberOfCommit;
+          underlineRun.glyphRun.numberOfGlyphs = numberOfIndices;
           impl.mModel->mVisualModel->mUnderlineRuns.PushBack(underlineRun);
 
           //Mark-up processor case
@@ -472,9 +472,9 @@ bool ControllerImplModelUpdater::Update(Controller::Impl& impl, OperationsMask o
           backgroundColorRun.color                           = BACKGROUND_SUB5;
           impl.mModel->mLogicalModel->mBackgroundColorRuns.PushBack(backgroundColorRun);
 
-          GlyphRun underlineRun;
-          underlineRun.glyphIndex     = attrData.startIndex + numberOfCommit;
-          underlineRun.numberOfGlyphs = numberOfIndices;
+          UnderlinedGlyphRun underlineRun;
+          underlineRun.glyphRun.glyphIndex     = attrData.startIndex + numberOfCommit;
+          underlineRun.glyphRun.numberOfGlyphs = numberOfIndices;
           impl.mModel->mVisualModel->mUnderlineRuns.PushBack(underlineRun);
 
           //Mark-up processor case
@@ -493,9 +493,9 @@ bool ControllerImplModelUpdater::Update(Controller::Impl& impl, OperationsMask o
           backgroundColorRun.color                           = BACKGROUND_SUB6;
           impl.mModel->mLogicalModel->mBackgroundColorRuns.PushBack(backgroundColorRun);
 
-          GlyphRun underlineRun;
-          underlineRun.glyphIndex     = attrData.startIndex + numberOfCommit;
-          underlineRun.numberOfGlyphs = numberOfIndices;
+          UnderlinedGlyphRun underlineRun;
+          underlineRun.glyphRun.glyphIndex     = attrData.startIndex + numberOfCommit;
+          underlineRun.glyphRun.numberOfGlyphs = numberOfIndices;
           impl.mModel->mVisualModel->mUnderlineRuns.PushBack(underlineRun);
 
           //Mark-up processor case
@@ -514,9 +514,9 @@ bool ControllerImplModelUpdater::Update(Controller::Impl& impl, OperationsMask o
           backgroundColorRun.color                           = BACKGROUND_SUB7;
           impl.mModel->mLogicalModel->mBackgroundColorRuns.PushBack(backgroundColorRun);
 
-          GlyphRun underlineRun;
-          underlineRun.glyphIndex     = attrData.startIndex + numberOfCommit;
-          underlineRun.numberOfGlyphs = numberOfIndices;
+          UnderlinedGlyphRun underlineRun;
+          underlineRun.glyphRun.glyphIndex     = attrData.startIndex + numberOfCommit;
+          underlineRun.glyphRun.numberOfGlyphs = numberOfIndices;
           impl.mModel->mVisualModel->mUnderlineRuns.PushBack(underlineRun);
 
           //Mark-up processor case
@@ -571,6 +571,8 @@ bool ControllerImplModelUpdater::Update(Controller::Impl& impl, OperationsMask o
     if(impl.mModel->mVisualModel->IsMarkupProcessorEnabled())
     {
       impl.CopyUnderlinedFromLogicalToVisualModels(true);
+      impl.CopyStrikethroughFromLogicalToVisualModels();
+      impl.CopyCharacterSpacingFromLogicalToVisualModels();
     }
 
     updated = true;