X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-controller-impl-model-updater.cpp;h=e6ec978243bd0e97eb57d260210c3017daa49231;hb=6ba9927d226e40ce57844d837b61397cc721a133;hp=2d1e28d8a9113c4cdefacc47edb4fd93a36bfa23;hpb=aea5add7a82f4bd507d31526074238f2b641fcd8;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 2d1e28d..e6ec978 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