IconListView issue was fixed.

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

diff --git a/src/ui/FUi_AccessibilityContainer.cpp b/src/ui/FUi_AccessibilityContainer.cpp
index ce179ce..9240bdc 100644 (file)
--- a/src/ui/FUi_AccessibilityContainer.cpp
+++ b/src/ui/FUi_AccessibilityContainer.cpp
@@ -250,7 +250,22 @@ _AccessibilityContainer::GetChildElement(int index) const
                return false;
        }
 }
-
+bool
+_AccessibilityContainer::IsContains(const _AccessibilityElement& element)
+{
+       result r = E_SUCCESS;
+       _AccessibilityElement* pElement = null;
+       int count = __elementList.GetCount();
+       for (int i = 0; i < count ;i++)
+       {
+               r = __elementList.GetAt(i, pElement);
+               if (pElement == &element)
+               {
+                       return true;
+               }
+       }
+       return false;
+}
 _AccessibilityElement*
 _AccessibilityContainer::GetChildElement(const String& name) const
 {

diff --git a/src/ui/FUi_AccessibilityManager.cpp b/src/ui/FUi_AccessibilityManager.cpp
index 317814b..03e824b 100644 (file)
--- a/src/ui/FUi_AccessibilityManager.cpp
+++ b/src/ui/FUi_AccessibilityManager.cpp
@@ -1783,7 +1783,7 @@ _AccessibilityManager::MoveFocus(_AccessibilityFocusDirection direction)
 void
 _AccessibilityManager::RequestToDrawFocusUi()
 {
-       if (__targetControlHandle.IsValid())
+       if (__targetControlHandle.IsValid() && __pTargetContainer->IsContains(*__pTargetElement))
        {
                //HidePopup();
                DrawFocusUi(*__pTargetElement);

diff --git a/src/ui/inc/FUi_AccessibilityContainer.h b/src/ui/inc/FUi_AccessibilityContainer.h
index c73980d..898b230 100644 (file)
--- a/src/ui/inc/FUi_AccessibilityContainer.h
+++ b/src/ui/inc/FUi_AccessibilityContainer.h
@@ -141,7 +141,7 @@ public:
        _AccessibilityElement* GetChildElement(const Tizen::Base::String& name) const;
        void GetElements(Tizen::Base::Collection::IListT<_AccessibilityElement*>& list) const;
        Tizen::Base::Collection::IListT<_AccessibilityElement*>* GetElementsN(void) const;
-
+       bool IsContains(const _AccessibilityElement& element);
        result MoveElement(const _AccessibilityElement* pPreviousElement, const _AccessibilityElement& element);
 
        void SetFocusHandler(_IAccessibilityFocusHandler* pHandler);