X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ffocus-manager%2Fkeyboard-focus-manager-impl.cpp;h=04c15c44e67a99999283e9d3444c2d2b4fba8019;hb=453a02269ec66b61d23debab49fd2e7afed7d9e1;hp=e4eb16b94287fd970f26f634e06c15a9971e76dd;hpb=49d793abda445643e4b3b270c10af70aed3d2f52;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

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 e4eb16b..04c15c4 100644
--- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
+++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
@@ -21,13 +21,11 @@
 // EXTERNAL INCLUDES
 #include <cstring> // for strcmp
 #include <dali/public-api/actors/layer.h>
-#include <dali/devel-api/adaptor-framework/accessibility-adaptor.h>
 #include <dali/devel-api/common/singleton-service.h>
 #include <dali/devel-api/adaptor-framework/lifecycle-controller.h>
 #include <dali/public-api/animation/constraints.h>
-#include <dali/public-api/common/stage.h>
 #include <dali/public-api/events/key-event.h>
-#include <dali/public-api/events/touch-data.h>
+#include <dali/public-api/events/touch-event.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/object/type-registry-helper.h>
 #include <dali/public-api/object/property-map.h>
@@ -40,10 +38,10 @@
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/image-view/image-view.h>
-#include <dali-toolkit/public-api/accessibility-manager/accessibility-manager.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/public-api/styling/style-manager.h>
 #include <dali-toolkit/devel-api/styling/style-manager-devel.h>
+#include <dali/devel-api/adaptor-framework/accessibility.h>
 
 namespace Dali
 {
@@ -147,7 +145,7 @@ void KeyboardFocusManager::OnAdaptorInit()
     for( auto iter = sceneHolders.begin(); iter != sceneHolders.end(); ++iter )
     {
       ( *iter ).KeyEventSignal().Connect( mSlotDelegate, &KeyboardFocusManager::OnKeyEvent );
-      ( *iter ).TouchSignal().Connect( mSlotDelegate, &KeyboardFocusManager::OnTouch );
+      ( *iter ).TouchedSignal().Connect( mSlotDelegate, &KeyboardFocusManager::OnTouch );
       Dali::Window window = DevelWindow::DownCast( *iter );
       if( window )
       {
@@ -163,7 +161,7 @@ void KeyboardFocusManager::OnAdaptorInit()
 void KeyboardFocusManager::OnSceneHolderCreated( Dali::Integration::SceneHolder& sceneHolder )
 {
   sceneHolder.KeyEventSignal().Connect( mSlotDelegate, &KeyboardFocusManager::OnKeyEvent );
-  sceneHolder.TouchSignal().Connect( mSlotDelegate, &KeyboardFocusManager::OnTouch );
+  sceneHolder.TouchedSignal().Connect( mSlotDelegate, &KeyboardFocusManager::OnTouch );
   Dali::Window window = DevelWindow::DownCast( sceneHolder );
   if( window )
   {
@@ -747,12 +745,7 @@ Actor KeyboardFocusManager::GetFocusIndicatorActor()
 
 void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event)
 {
-  AccessibilityAdaptor accessibilityAdaptor = AccessibilityAdaptor::Get();
-  bool isAccessibilityEnabled = accessibilityAdaptor.IsEnabled();
-
-  Toolkit::AccessibilityManager accessibilityManager = Toolkit::AccessibilityManager::Get();
-
-  std::string keyName = event.keyPressedName;
+  std::string keyName = event.GetKeyName();
 
   if( mIsFocusIndicatorShown == UNKNOWN )
   {
@@ -761,11 +754,11 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event)
 
   bool isFocusStartableKey = false;
 
-  if(event.state == KeyEvent::Down)
+  if(event.GetState() == KeyEvent::DOWN)
   {
     if (keyName == "Left")
     {
-      if(!isAccessibilityEnabled)
+      if(!mIsFocusIndicatorShown)
       {
         if(mIsFocusIndicatorShown == HIDE)
         {
@@ -782,13 +775,15 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event)
       }
       else
       {
-        // Move the accessibility focus backward
-        accessibilityManager.MoveFocusBackward();
+        // Move the focus towards left
+        MoveFocus(Toolkit::Control::KeyboardFocus::LEFT);
       }
+
+      isFocusStartableKey = true;
     }
     else if (keyName == "Right")
     {
-      if(!isAccessibilityEnabled)
+      if(!mIsFocusIndicatorShown)
       {
         if( mIsFocusIndicatorShown == HIDE )
         {
@@ -803,13 +798,13 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event)
       }
       else
       {
-        // Move the accessibility focus forward
-        accessibilityManager.MoveFocusForward();
+        // Move the focus towards right
+        MoveFocus(Toolkit::Control::KeyboardFocus::RIGHT);
       }
 
       isFocusStartableKey = true;
     }
-    else if (keyName == "Up" && !isAccessibilityEnabled)
+    else if (keyName == "Up")
     {
       if( mIsFocusIndicatorShown == HIDE )
       {
@@ -824,7 +819,7 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event)
 
       isFocusStartableKey = true;
     }
-    else if (keyName == "Down" && !isAccessibilityEnabled)
+    else if (keyName == "Down")
     {
       if( mIsFocusIndicatorShown == HIDE )
       {
@@ -839,7 +834,7 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event)
 
       isFocusStartableKey = true;
     }
-    else if (keyName == "Prior" && !isAccessibilityEnabled)
+    else if (keyName == "Prior")
     {
       if( mIsFocusIndicatorShown == HIDE )
       {
@@ -854,7 +849,7 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event)
 
       isFocusStartableKey = true;
     }
-    else if (keyName == "Next" && !isAccessibilityEnabled)
+    else if (keyName == "Next")
     {
       if( mIsFocusIndicatorShown == HIDE )
       {
@@ -869,7 +864,7 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event)
 
       isFocusStartableKey = true;
     }
-    else if (keyName == "Tab" && !isAccessibilityEnabled)
+    else if (keyName == "Tab")
     {
       if( mIsFocusIndicatorShown == HIDE )
       {
@@ -885,7 +880,7 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event)
 
       isFocusStartableKey = true;
     }
-    else if (keyName == "space" && !isAccessibilityEnabled)
+    else if (keyName == "space")
     {
       if( mIsFocusIndicatorShown == HIDE )
       {
@@ -895,7 +890,7 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event)
 
       isFocusStartableKey = true;
     }
-    else if (keyName == "" && !isAccessibilityEnabled)
+    else if (keyName == "")
     {
       // Check the fake key event for evas-plugin case
       if( mIsFocusIndicatorShown == HIDE )
@@ -906,19 +901,19 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event)
 
       isFocusStartableKey = true;
     }
-    else if (keyName == "Backspace" && !isAccessibilityEnabled)
+    else if (keyName == "Backspace")
     {
       // Emit signal to go back to the previous view???
     }
-    else if (keyName == "Escape" && !isAccessibilityEnabled)
+    else if (keyName == "Escape")
     {
     }
   }
-  else if(event.state == KeyEvent::Up)
+  else if(event.GetState() == KeyEvent::UP)
   {
     if (keyName == "Return")
     {
-      if((mIsFocusIndicatorShown == HIDE) && !isAccessibilityEnabled)
+      if( mIsFocusIndicatorShown == HIDE )
       {
         // Show focus indicator
         mIsFocusIndicatorShown = SHOW;
@@ -926,16 +921,7 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event)
       else
       {
         // The focused actor has enter pressed on it
-        Actor actor;
-        if( !isAccessibilityEnabled )
-        {
-          actor = GetCurrentFocusActor();
-        }
-        else
-        {
-          actor = accessibilityManager.GetCurrentFocusActor();
-        }
-
+        Actor actor = GetCurrentFocusActor();
         if( actor )
         {
           DoKeyboardEnter( actor );
@@ -946,7 +932,7 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event)
     }
   }
 
-  if(isFocusStartableKey && ( mIsFocusIndicatorShown == SHOW ) && !isAccessibilityEnabled)
+  if( isFocusStartableKey && mIsFocusIndicatorShown == SHOW )
   {
     Actor actor = GetCurrentFocusActor();
     if( actor )
@@ -963,10 +949,11 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event)
       // Let's try to move the initial focus
       MoveFocus(Toolkit::Control::KeyboardFocus::RIGHT);
     }
+
   }
 }
 
-void KeyboardFocusManager::OnTouch(const TouchData& touch)
+void KeyboardFocusManager::OnTouch(const TouchEvent& touch)
 {
   // if mIsFocusIndicatorShown is UNKNOWN, it means Configuration is not loaded.
   // Try to load configuration.