X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ffocus-manager%2Fkeyboard-focus-manager-impl.cpp;h=e6ed69168a0d0e16477516dd6574f03d8ad8ac3a;hp=54d8afabc4c1b5614e5966a02a0b6d4965be10bf;hb=9cb232d3175473cbdcb4729432678bd2e0160007;hpb=4107c0f5ea45cd9e4e61d30c30e99de0e00287fc

diff --git a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
index 54d8afa..e6ed691 100644
--- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
+++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
@@ -149,9 +149,11 @@ bool KeyboardFocusManager::DoSetCurrentFocusActor( const unsigned int actorID )
   if( actor && actor.IsKeyboardFocusable() )
   {
     mIsFocusIndicatorEnabled = true;
-    // Draw the focus indicator upon the focused actor
-    actor.Add( GetFocusIndicatorActor() );
-
+    // Draw the focus indicator upon the focused actor when PhysicalKeyboard is attached
+    if( mIsKeyboardFocusEnabled )
+    {
+      actor.Add( GetFocusIndicatorActor() );
+    }
     // Send notification for the change of focus actor
     if( !mFocusChangedSignal.Empty() )
     {