Fix for Gallery Issue N_SE-52370

Change-Id: Ic374a7f722ac70196ef00c355edb02f6151bb05b
Signed-off-by: nm.gonapa <nm.gonapa@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_Gallery.cpp b/src/ui/controls/FUiCtrl_Gallery.cpp
index 0e0c10e..269c896 100644 (file)
--- a/src/ui/controls/FUiCtrl_Gallery.cpp
+++ b/src/ui/controls/FUiCtrl_Gallery.cpp
@@ -55,7 +55,6 @@ _Gallery::_Gallery(void)
        , __longPressed(false)
        , __keyEventProcessing(false)
        , __pGalleryImageElement(null)
-       , __isFocused(false)
 {
        _AccessibilityContainer* pContainer = GetAccessibilityContainer();
        if (pContainer != null)
@@ -716,7 +715,7 @@ _Gallery::OnSettingChanged(Tizen::Base::String& key)
 bool
 _Gallery::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo)
 {
-       if (!__isFocused)
+       if (!IsFocusModeStateEnabled())
        {
                return false;
        }
@@ -833,7 +832,7 @@ _Gallery::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo)
 bool
 _Gallery::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
 {
-       if (!__isFocused)
+       if (!IsFocusModeStateEnabled())
        {
                return false;
        }
@@ -850,24 +849,18 @@ _Gallery::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
 bool
 _Gallery::OnFocusGained(const _Control& source)
 {
-       if (IsFocusModeStateEnabled())
-       {
-               __isFocused = true;
-       }
-
        return _Control::OnFocusGained(source);
 }
 
 void
 _Gallery::OnFocusModeStateChanged(void)
 {
-       __isFocused = false;
+
 }
 
 bool
 _Gallery::OnFocusLost(const _Control& source)
 {
-       __isFocused = false;
        return _Control::OnFocusLost(source);
 }
 

diff --git a/src/ui/inc/FUiCtrl_Gallery.h b/src/ui/inc/FUiCtrl_Gallery.h
index bf52a37..255fc94 100644 (file)
--- a/src/ui/inc/FUiCtrl_Gallery.h
+++ b/src/ui/inc/FUiCtrl_Gallery.h
@@ -194,7 +194,6 @@ private:
        bool __keyEventProcessing;
 
        Tizen::Ui::_AccessibilityElement* __pGalleryImageElement;
-       bool __isFocused;
 }; // _Gallery
 
 }}}