X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Flogical-model-impl.cpp;h=9b669258b56b025364e53f04ed524f626a7c45f5;hp=dcfb3e4a1d2f0646bf71ec7c8779238d950b68c6;hb=b56e45f7d2cf803ab0124448060149f16a6c088e;hpb=3e30971f9884dc48e80ef82de4ef85fc9dba1229 diff --git a/dali-toolkit/internal/text/logical-model-impl.cpp b/dali-toolkit/internal/text/logical-model-impl.cpp index dcfb3e4..9b66925 100644 --- a/dali-toolkit/internal/text/logical-model-impl.cpp +++ b/dali-toolkit/internal/text/logical-model-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -380,7 +380,7 @@ void LogicalModel::RetrieveStyle( CharacterIndex index, InputStyle& style ) const FontDescriptionRun& fontDescriptionRun = *( fontDescriptionRunsBuffer + nameIndex ); style.familyName = std::string( fontDescriptionRun.familyName, fontDescriptionRun.familyLength ); - style.familyDefined = true; + style.isFamilyDefined = true; } // Set the font's weight if it's overriden. @@ -389,7 +389,7 @@ void LogicalModel::RetrieveStyle( CharacterIndex index, InputStyle& style ) const FontDescriptionRun& fontDescriptionRun = *( fontDescriptionRunsBuffer + weightIndex ); style.weight = fontDescriptionRun.weight; - style.weightDefined = true; + style.isWeightDefined = true; } // Set the font's width if it's overriden. @@ -398,7 +398,7 @@ void LogicalModel::RetrieveStyle( CharacterIndex index, InputStyle& style ) const FontDescriptionRun& fontDescriptionRun = *( fontDescriptionRunsBuffer + widthIndex ); style.width = fontDescriptionRun.width; - style.widthDefined = true; + style.isWidthDefined = true; } // Set the font's slant if it's overriden. @@ -407,7 +407,7 @@ void LogicalModel::RetrieveStyle( CharacterIndex index, InputStyle& style ) const FontDescriptionRun& fontDescriptionRun = *( fontDescriptionRunsBuffer + slantIndex ); style.slant = fontDescriptionRun.slant; - style.slantDefined = true; + style.isSlantDefined = true; } // Set the font's size if it's overriden. @@ -416,7 +416,7 @@ void LogicalModel::RetrieveStyle( CharacterIndex index, InputStyle& style ) const FontDescriptionRun& fontDescriptionRun = *( fontDescriptionRunsBuffer + sizeIndex ); style.size = static_cast( fontDescriptionRun.size ) / 64.f; - style.sizeDefined = true; + style.isSizeDefined = true; } }