X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Frendering%2Fview-model.cpp;h=9be821572a8881aeeaab3b0ef8f19bcdb2688f92;hp=27932b247adcb4e70a6a78770c80f511c1edc85d;hb=d82494a77e405d5924cf1af3fe55b2d9b9577e3f;hpb=30758c617dee3352070497133b24818674d5d646 diff --git a/dali-toolkit/internal/text/rendering/view-model.cpp b/dali-toolkit/internal/text/rendering/view-model.cpp index 27932b2..9be8215 100755 --- a/dali-toolkit/internal/text/rendering/view-model.cpp +++ b/dali-toolkit/internal/text/rendering/view-model.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -203,7 +203,7 @@ const Vector4& ViewModel::GetOutlineColor() const return mModel->GetOutlineColor(); } -float ViewModel::GetOutlineWidth() const +uint16_t ViewModel::GetOutlineWidth() const { return mModel->GetOutlineWidth(); } @@ -349,11 +349,6 @@ void ViewModel::ElideGlyphs() { if( index > 0u ) { - // If the index decreases to the previous line, firstPenX must be recalculated. - if( numberOfLaidOutGlyphs - index == lastLine.glyphRun.numberOfGlyphs) - { - firstPenSet = false; - } --index; } else