OptionMenu focusUi issue fix

Signed-off-by: vipul <vipul.kumar@samsung.com>
Change-Id: Icb26b7251bb5bfe80119a40489e8c9e09edbc3b1

diff --git a/src/ui/controls/FUiCtrl_OptionMenu.cpp b/src/ui/controls/FUiCtrl_OptionMenu.cpp
index 0527d86..9afb398 100644 (file)
--- a/src/ui/controls/FUiCtrl_OptionMenu.cpp
+++ b/src/ui/controls/FUiCtrl_OptionMenu.cpp
@@ -243,7 +243,7 @@ _OptionMenu::OnKeyPressed(const _Control &source, const _KeyInfo &keyInfo)
 
        if (!__isFocused)
        {
-               if (keyCode == _KEY_TAB)
+               if (keyCode == _KEY_TAB || keyCode == _KEY_UP || keyCode == _KEY_DOWN)
                {
                        __isFocused = true;
                        __currentFocusedIndex = 0;
@@ -316,7 +316,7 @@ _OptionMenu::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
 {
        _KeyCode keyCode = keyInfo.GetKeyCode();
 
-       if (keyCode ==  _KEY_ENTER)
+       if (keyCode ==  _KEY_ENTER && __isFocused)
        {
                __pOptionMenuPresenter->OnEnterKeyReleased(__currentFocusedIndex);
                return true;