From 89256a0f8735bf2e62e309f375f62ae4d9ba5a03 Mon Sep 17 00:00:00 2001 From: "moinuddin.s" Date: Thu, 4 Jul 2013 12:58:37 +0530 Subject: [PATCH] Fixed JIRA N_SE-44591, N_SE-44587 in OptionMenu Signed-off-by: moinuddin.s Change-Id: Iaa328bbcb5e5f07e8bbf6435d28a603257ef15bc Signed-off-by: moinuddin.s --- src/ui/controls/FUiCtrl_EditDatePresenter.cpp | 2 ++ src/ui/controls/FUiCtrl_EditTimePresenter.cpp | 2 ++ src/ui/controls/FUiCtrl_OptionMenu.cpp | 13 +++++++++---- src/ui/controls/FUiCtrl_OptionMenuPresenter.cpp | 2 +- src/ui/inc/FUiCtrl_OptionMenuPresenter.h | 2 +- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/ui/controls/FUiCtrl_EditDatePresenter.cpp b/src/ui/controls/FUiCtrl_EditDatePresenter.cpp index 6a62b2c..1d17713 100644 --- a/src/ui/controls/FUiCtrl_EditDatePresenter.cpp +++ b/src/ui/controls/FUiCtrl_EditDatePresenter.cpp @@ -1275,6 +1275,8 @@ _EditDatePresenter::OnTouchReleased(const _Control& source, const _TouchInfo& to if ((__pEditDate->GetDateTimeBar() != null) && (GetLastSelectedId() != DATETIME_ID_NONE)) { + __pEditDate->SetFocused(true); + FloatRectangle bounds(0.0f, 0.0f, 0.0f, 0.0f); bounds = GetDateAreaBounds(GetLastSelectedId()); FloatRectangle absoluteBounds(0.0f, 0.0f, 0.0f, 0.0f); diff --git a/src/ui/controls/FUiCtrl_EditTimePresenter.cpp b/src/ui/controls/FUiCtrl_EditTimePresenter.cpp index 14f9398..7b866c5 100644 --- a/src/ui/controls/FUiCtrl_EditTimePresenter.cpp +++ b/src/ui/controls/FUiCtrl_EditTimePresenter.cpp @@ -1487,6 +1487,8 @@ _EditTimePresenter::OnTouchReleased(const _Control& source, const _TouchInfo& to if ((__pEditTime->GetDateTimeBar() != null) && (boxId != DATETIME_ID_AMPM) && (GetLastSelectedId() != DATETIME_ID_NONE)) { + __pEditTime->SetFocused(true); + FloatRectangle bounds(0.0f, 0.0f, 0.0f, 0.0f); bounds = GetDisplayAreaBoundsFromHoursStyle(GetLastSelectedId()); FloatRectangle absoluteBounds(0.0f, 0.0f, 0.0f, 0.0f); diff --git a/src/ui/controls/FUiCtrl_OptionMenu.cpp b/src/ui/controls/FUiCtrl_OptionMenu.cpp index f91fb9b..93bf204 100644 --- a/src/ui/controls/FUiCtrl_OptionMenu.cpp +++ b/src/ui/controls/FUiCtrl_OptionMenu.cpp @@ -301,10 +301,6 @@ _OptionMenu::OnKeyPressed(const _Control &source, const _KeyInfo &keyInfo) } break; - case _KEY_ENTER: - __pOptionMenuPresenter->OnEnterKeyPressed(__currentFocusedIndex); - return true; - default: return true; } @@ -319,8 +315,17 @@ _OptionMenu::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo) { _KeyCode keyCode = keyInfo.GetKeyCode(); + if (keyCode == _KEY_ENTER) + { + __pOptionMenuPresenter->OnEnterKeyReleased(__currentFocusedIndex); + return true; + } + if (keyCode == _KEY_ESC || keyCode == _KEY_BACK) { + __isFocused = false; + __pOptionMenuPresenter->ClearFocus(); + SetVisibleState(false); return true; } diff --git a/src/ui/controls/FUiCtrl_OptionMenuPresenter.cpp b/src/ui/controls/FUiCtrl_OptionMenuPresenter.cpp index c4bad5b..cccde7a 100755 --- a/src/ui/controls/FUiCtrl_OptionMenuPresenter.cpp +++ b/src/ui/controls/FUiCtrl_OptionMenuPresenter.cpp @@ -784,7 +784,7 @@ _OptionMenuPresenter::ClearFocus(void) } void -_OptionMenuPresenter::OnEnterKeyPressed(int selectedIndex) +_OptionMenuPresenter::OnEnterKeyReleased(int selectedIndex) { _OptionMenuItem* pItem = null; pItem = __pModel->GetItem(selectedIndex); diff --git a/src/ui/inc/FUiCtrl_OptionMenuPresenter.h b/src/ui/inc/FUiCtrl_OptionMenuPresenter.h index e67e0eb..7e988e6 100644 --- a/src/ui/inc/FUiCtrl_OptionMenuPresenter.h +++ b/src/ui/inc/FUiCtrl_OptionMenuPresenter.h @@ -72,7 +72,7 @@ public: virtual result Draw(void); result DrawFocus(int index); void ClearFocus(void); - void OnEnterKeyPressed(int selectedIndex); + void OnEnterKeyReleased(int selectedIndex); virtual result DrawBackground(Tizen::Graphics::Canvas* pCanvas); virtual result AddItem(const Tizen::Base::String& text, int actionId, const Tizen::Graphics::Bitmap* normalBitmap, const Tizen::Graphics::Bitmap* pPressedBitmap, const Tizen::Graphics::Bitmap* pHighlightedBitmap); virtual result AddSubItem(int mainIndex, const Tizen::Base::String& text, int actionId); -- 2.7.4