From e232ff307eaa76bb80c7027e9943cf5f76682236 Mon Sep 17 00:00:00 2001 From: Agnelo Vaz Date: Mon, 8 Jun 2015 17:40:54 +0100 Subject: [PATCH] Control to call Init derived classes before applying style Change-Id: Ib485ee1b53906a279f8e53797a492ddaf2552c94 Signed-off-by: Agnelo Vaz --- dali-toolkit/public-api/controls/control-impl.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index 1cb02bf..0d7a2f0 100644 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -797,6 +797,9 @@ Control::Control( ControlBehaviour behaviourFlags ) void Control::Initialize() { + // Call deriving classes so initialised before styling is applied to them. + OnInitialize(); + if( mImpl->mFlags & REQUIRES_STYLE_CHANGE_SIGNALS ) { Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); @@ -804,7 +807,7 @@ void Control::Initialize() // Register for style changes styleManager.StyleChangeSignal().Connect( this, &Control::OnStyleChange ); - // SetTheme + // Apply the current style GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); } @@ -812,9 +815,6 @@ void Control::Initialize() { SetKeyboardNavigationSupport( true ); } - - // Calling deriving classes - OnInitialize(); } void Control::OnInitialize() -- 2.7.4