X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Ftext%2Ftext-utils-devel.cpp;h=1441dc40d00c34eb30bc33da5cbf8ce651c9973c;hp=e5ad92571454dda2f06e67d6b6c4509cf33dffb4;hb=92cbca2f5bd2e15fa589448d4c884b71f4fef03c;hpb=37a6580a8a0c9c449947872c5aa62daab57456a5 diff --git a/dali-toolkit/devel-api/text/text-utils-devel.cpp b/dali-toolkit/devel-api/text/text-utils-devel.cpp old mode 100755 new mode 100644 index e5ad925..1441dc4 --- a/dali-toolkit/devel-api/text/text-utils-devel.cpp +++ b/dali-toolkit/devel-api/text/text-utils-devel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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. @@ -172,7 +172,8 @@ void ShapeTextPreprocess(const RendererParameters& textParameters, TextAbstracti MarkupProcessData markupProcessData(colorRuns, fontDescriptionRuns, - textModel->mLogicalModel->mEmbeddedItems); + textModel->mLogicalModel->mEmbeddedItems, + textModel->mLogicalModel->mAnchors); if(textParameters.markupEnabled) { @@ -1013,12 +1014,11 @@ Size LayoutText(const RendererParameters& textParameters, TextAbstraction::TextR // Set the layout parameters. Size textLayoutArea = Size(static_cast(textParameters.textWidth), - static_cast(textParameters.textHeight)); + static_cast(textParameters.textHeight)); // padding - Extents padding = textParameters.padding; - internalDataModel.textLayoutArea = Size(textLayoutArea.x - ( padding.start + padding.end ), textLayoutArea.y - ( padding.top + padding.bottom ) ); - + Extents padding = textParameters.padding; + internalDataModel.textLayoutArea = Size(textLayoutArea.x - (padding.start + padding.end), textLayoutArea.y - (padding.top + padding.bottom)); if(isCircularTextLayout) {