From c87e330dcc0e6691c348dbbad9e427d8a2c4614d Mon Sep 17 00:00:00 2001 From: Agnelo Vaz Date: Mon, 27 Jul 2015 17:14:31 +0100 Subject: [PATCH] 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 --- dali-toolkit/internal/styling/style-manager-impl.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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) { -- 2.7.4