From f5ed4a996686deba3134f82e61ac7e788b75233f Mon Sep 17 00:00:00 2001 From: "keonpyo.kong" Date: Wed, 26 Jun 2013 21:52:13 +0900 Subject: [PATCH] bug fix focus manager Change-Id: Ia997b41e55021f19753250d9626f15b5ee7ec0ad Signed-off-by: keonpyo.kong apply code review Change-Id: I9314d01201a079e2466e05abc7f4e3af08e98ac5 Signed-off-by: keonpyo.kong --- src/ui/FUi_FocusManagerImpl.cpp | 7 +++++-- src/ui/FUi_Window.cpp | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ui/FUi_FocusManagerImpl.cpp b/src/ui/FUi_FocusManagerImpl.cpp index 0a1f670..1f8dc19 100644 --- a/src/ui/FUi_FocusManagerImpl.cpp +++ b/src/ui/FUi_FocusManagerImpl.cpp @@ -405,9 +405,12 @@ _FocusManagerImpl::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo) focusDirection = FOCUS_DIRECTION_DOWNWARD; break; } + default : + { + return false; + } } - - StartFocusTraversal(pControl, focusDirection); + StartFocusTraversal(pControl, focusDirection); return false; } diff --git a/src/ui/FUi_Window.cpp b/src/ui/FUi_Window.cpp index 4ab1148..c532a34 100644 --- a/src/ui/FUi_Window.cpp +++ b/src/ui/FUi_Window.cpp @@ -987,6 +987,7 @@ _Window:: SetFocusControl(const _Control* pControl, bool on) else { pControlMgr->SetFocusControl(*this, false); + SetFocused(); } } -- 2.7.4