X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fvisual-model-impl.cpp;h=6a06e58a31b24f266aff67f4340c87fa1bbf361f;hp=bd567a46cad10cfa363cbe91e7cbb78824287f49;hb=528aa3699cd51dab5115bca1aaebb65d4bc67c15;hpb=71f0932efe2c993f7866949767019d170ced9938 diff --git a/dali-toolkit/internal/text/visual-model-impl.cpp b/dali-toolkit/internal/text/visual-model-impl.cpp index bd567a4..6a06e58 100755 --- a/dali-toolkit/internal/text/visual-model-impl.cpp +++ b/dali-toolkit/internal/text/visual-model-impl.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. @@ -373,7 +373,7 @@ void VisualModel::SetUnderlineHeight( float height ) mUnderlineHeight = height; } -void VisualModel::SetOutlineWidth( unsigned int width ) +void VisualModel::SetOutlineWidth( uint16_t width ) { mOutlineWidth = width; } @@ -428,7 +428,7 @@ float VisualModel::GetUnderlineHeight() const return mUnderlineHeight; } -unsigned int VisualModel::GetOutlineWidth() const +uint16_t VisualModel::GetOutlineWidth() const { return mOutlineWidth; } @@ -469,12 +469,12 @@ VisualModel::VisualModel() mShadowColor( Color::BLACK ), mUnderlineColor( Color::BLACK ), mOutlineColor( Color::WHITE ), - mBackgroundColor( Color::CYAN ), + mBackgroundColor( Color::TRANSPARENT ), mControlSize(), mShadowOffset(), mUnderlineHeight( 0.0f ), - mOutlineWidth( 0u ), mShadowBlurRadius( 0.0f ), + mOutlineWidth( 0u ), mNaturalSize(), mLayoutSize(), mCachedLineIndex( 0u ),