From: Agnelo Vaz <agnelo.vaz@samsung.com>
Date: Mon, 27 Jul 2015 16:14:31 +0000 (+0100)
Subject: Style Manager to create ThemeBuilder before Applying Style
X-Git-Tag: dali_1.0.51~6
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=c87e330dcc0e6691c348dbbad9e427d8a2c4614d

Style Manager to create ThemeBuilder before Applying Style

* Fix bug in which Control::Initialize tries to ApplyStyle but StyleManager does not create a theme builder unless SetStyleName called.

Change-Id: I34a1854a1a4b2c6e08fbbdb21dffa4b04055cfcc
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
---

diff --git a/dali-toolkit/internal/styling/style-manager-impl.cpp b/dali-toolkit/internal/styling/style-manager-impl.cpp
index c245c15..08d61fd 100644
--- a/dali-toolkit/internal/styling/style-manager-impl.cpp
+++ b/dali-toolkit/internal/styling/style-manager-impl.cpp
@@ -303,10 +303,7 @@ void StyleManager::ApplyThemeStyle( Toolkit::Control control )
 
 void StyleManager::ApplyThemeStyleAtInit( Toolkit::Control control )
 {
-  if( mThemeBuilder )
-  {
-    ApplyStyle( mThemeBuilder, control );
-  }
+  ApplyThemeStyle( control );
 
   if(mFeedbackStyle)
   {