From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Thu, 27 Dec 2018 14:02:25 +0000 (+0000)
Subject: Merge "Enable Property::LABEL visual of a button when CreateVisuals" into devel/master
X-Git-Tag: dali_1.4.1~7
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=b5b75a20279ee1671b8a78228583cf5114536fb0;hp=7c4829108a1196e07f0eb93207ea234e3741642b

Merge "Enable Property::LABEL visual of a button when CreateVisuals" into devel/master
---

diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp
index 8c35f25..3207f9b 100644
--- a/dali-toolkit/internal/controls/buttons/button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/button-impl.cpp
@@ -445,7 +445,8 @@ void Button::CreateVisualsForComponent( Property::Index index, const Property::V
                    index, DevelControl::IsVisualEnabled( *this, index )?"true":"false" );
     // enable the visual if needed for current state
     const bool enabled = ( ( index == VISUAL_INDEX_FOR_STATE[ mButtonState ][ BACKGROUND ] )||
-                           ( index == VISUAL_INDEX_FOR_STATE[ mButtonState ][ FOREGROUND ] ) );
+                           ( index == VISUAL_INDEX_FOR_STATE[ mButtonState ][ FOREGROUND ] )||
+                           ( index == Toolkit::Button::Property::LABEL ) );
     DevelControl::RegisterVisual( *this, index, buttonVisual, enabled, visualDepth );
   }
   else