X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol-impl.cpp;h=fffbe6962a4516972ff6482fc990c736007e04ea;hp=19be9ba3a4df387689dab83eab76482c557fd3b4;hb=9795d65d103bdf0524aa92e96475019eff2705f3;hpb=9455df45d5cb37bb71a34334e1c9dc8a96683f20

diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp
index 19be9ba..fffbe69 100644
--- a/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/dali-toolkit/public-api/controls/control-impl.cpp
@@ -1142,7 +1142,11 @@ bool Control::HasKeyInputFocus()
   bool result = false;
   if( Self().OnStage() )
   {
-    result = Toolkit::KeyInputFocusManager::Get().IsKeyboardListener(Toolkit::Control::DownCast(Self()));
+    Toolkit::Control control = Toolkit::KeyInputFocusManager::Get().GetCurrentFocusControl();
+    if( Self() == control )
+    {
+      result = true;
+    }
   }
   return result;
 }
@@ -1500,8 +1504,8 @@ void Control::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Ty
   if( styleManager && change == StyleChange::THEME_CHANGE )
   {
     GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) );
+    RelayoutRequest();
   }
-  RelayoutRequest();
 }
 
 void Control::OnPinch(const PinchGesture& pinch)