From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Fri, 16 Feb 2018 15:30:21 +0000 (+0000)
Subject: Merge "Text background support for TextLabel" into devel/master
X-Git-Tag: dali_1.3.13~5
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=86824206ffe1f9d1ee92ad1fbdd209c8155cd437

Merge "Text background support for TextLabel" into devel/master
---

86824206ffe1f9d1ee92ad1fbdd209c8155cd437
diff --cc dali-toolkit/internal/visuals/text/text-visual.cpp
index 0f43d7d,ca3d296..d1ad16c
--- a/dali-toolkit/internal/visuals/text/text-visual.cpp
+++ b/dali-toolkit/internal/visuals/text/text-visual.cpp
@@@ -702,13 -711,14 +715,14 @@@ void TextVisual::UpdateRenderer(
  
        const bool underlineEnabled = mController->GetTextModel()->IsUnderlineEnabled();
        const bool outlineEnabled = ( mController->GetTextModel()->GetOutlineWidth() > Math::MACHINE_EPSILON_1 );
+       const bool backgroundEnabled = mController->GetTextModel()->IsBackgroundEnabled();;
  
-       const bool styleEnabled = ( shadowEnabled || underlineEnabled || outlineEnabled );
+       const bool styleEnabled = ( shadowEnabled || underlineEnabled || outlineEnabled || backgroundEnabled );
  
 -      TextureSet textureSet = GetTextTexture( relayoutSize, hasMultipleTextColors, containsEmoji, styleEnabled );
 +      TextureSet textureSet = GetTextTexture( relayoutSize, hasMultipleTextColors, containsColorGlyph, styleEnabled );
        mImpl->mRenderer.SetTextures( textureSet );
  
 -      Shader shader = GetTextShader( mFactoryCache, hasMultipleTextColors, containsEmoji, styleEnabled );
 +      Shader shader = GetTextShader( mFactoryCache, hasMultipleTextColors, containsColorGlyph, styleEnabled );
        mImpl->mRenderer.SetShader(shader);
  
        mImpl->mFlags &= ~Impl::IS_ATLASING_APPLIED;