Accessibility bug fix

Change-Id: Ic69a367e4ae8fb1a23ce23894d2cf4fcf4aa163e
Signed-off-by: Bumseung Cho <bumseung.cho@samsung.com>

diff --git a/src/ui/FUi_AccessibilityManager.cpp b/src/ui/FUi_AccessibilityManager.cpp
index 86cbb9a..eec6b68 100644 (file)
--- a/src/ui/FUi_AccessibilityManager.cpp
+++ b/src/ui/FUi_AccessibilityManager.cpp
@@ -1594,7 +1594,6 @@ _AccessibilityManager::MoveFocus(_AccessibilityFocusDirection direction)
 
                else
                {
-                       DrawFocusUi(*pElement);
                        __pTargetElement = pElement;
                        __pTargetContainer = pContainer;
                        __targetControlHandle = pContainer->GetOwner().GetHandle();
@@ -1609,8 +1608,9 @@ _AccessibilityManager::MoveFocus(_AccessibilityFocusDirection direction)
                                                _IAccessibilityListener* pListener = null;
                                                if (pListenerList->GetAt(i, pListener) == E_SUCCESS)
                                                {
-                                                       pListener->OnAccessibilityFocusIn(*__pTargetContainer, *__pTargetElement);
-                                                       if (direction == _ACCESSIBILITY_FOCUS_DIRECTION_PREVIOUS)
+                            pListener->OnAccessibilityFocusIn(*__pTargetContainer, *__pTargetElement);
+                            DrawFocusUi(*__pTargetElement);
+                            if (direction == _ACCESSIBILITY_FOCUS_DIRECTION_PREVIOUS)
                                                        {
                                                                pListener->OnAccessibilityFocusMovedPrevious(*__pTargetContainer, *__pTargetElement);
                                                        }
@@ -1622,6 +1622,10 @@ _AccessibilityManager::MoveFocus(_AccessibilityFocusDirection direction)
                                        }
                                }
                        }
+            else
+            {
+                DrawFocusUi(*__pTargetElement);
+            }
                        delete pListenerList;
                        pListenerList = null;
 
@@ -1843,7 +1847,6 @@ _AccessibilityManager::ProcessGesture(_AccessibilityGestureType type, const Floa
                        }
                        else
                        {
-                               DrawFocusUi(*pElement);
                                __pTargetContainer = pAccContainer;
                                __targetControlHandle = pAccContainer->GetOwner().GetHandle();
                                __pTargetElement = pElement;
@@ -1860,8 +1863,9 @@ _AccessibilityManager::ProcessGesture(_AccessibilityGestureType type, const Floa
                                                }
                                        }
                                        delete pList;
-                               }
-                               ReadElement(*pElement);
+                }
+                DrawFocusUi(*pElement);
+                ReadElement(*pElement);
                        }
                }
                        break;