Fix back key

Change-Id: Ia7d84e19729849a077d61881beffe5a784f1cc32
Signed-off-by: HeeJu Kang <mobum.kang@samsung.com>

diff --git a/src/FShell_AppWidgetPopupView.cpp b/src/FShell_AppWidgetPopupView.cpp
index e6a5173..3fbe0e3 100644 (file)
--- a/src/FShell_AppWidgetPopupView.cpp
+++ b/src/FShell_AppWidgetPopupView.cpp
@@ -136,8 +136,6 @@ _AppWidgetPopupView::Initialize(const FloatRectangle& bounds)
 
        SetBackgroundColor(Color(0, 0, 0, 0));
 
-       SetFocusable(false);
-
        return r;
 }
 
@@ -378,6 +376,25 @@ _AppWidgetPopupView::OnTouchMoved(const _Control& source, const _TouchInfo& touc
        return false;
 }
 
+bool
+_AppWidgetPopupView::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
+{
+       _KeyCode keyCode = keyInfo.GetKeyCode();
+       switch(keyCode)
+       {
+       case _KEY_BACK:
+       case _KEY_ESC:
+               PlayAnimation(false);
+               return true;
+               break;
+
+       default:
+               break;
+       }
+
+       return false;
+}
+
 void
 _AppWidgetPopupView::OnBoundsChanged(void)
 {
@@ -394,6 +411,8 @@ _AppWidgetPopupView::OnAttachedToMainTree(void)
 {
        result r = _Window::OnAttachedToMainTree();
 
+       SetFocused(true);
+
        _Window* pWindow = _ControlManager::GetInstance()->GetCurrentFrame();
        if (pWindow)
        {

diff --git a/src/FShell_AppWidgetPopupView.h b/src/FShell_AppWidgetPopupView.h
index 8677b53..17e4533 100644 (file)
--- a/src/FShell_AppWidgetPopupView.h
+++ b/src/FShell_AppWidgetPopupView.h
@@ -30,6 +30,7 @@
 #include <Ecore_X.h>
 #include <FUiCtrl_IFrameEventListener.h>
 #include <FUi_Window.h>
+#include <FUi_UiKeyEvent.h>
 
 namespace Tizen { namespace Base
 {
@@ -94,6 +95,7 @@ private:
        virtual bool OnTouchPressed(const Tizen::Ui::_Control& source, const Tizen::Ui::_TouchInfo& touchInfo);
        virtual bool OnTouchReleased(const Tizen::Ui::_Control& source, const Tizen::Ui::_TouchInfo& touchInfo);
        virtual bool OnTouchMoved(const Tizen::Ui::_Control& source, const Tizen::Ui::_TouchInfo& touchInfo);
+       virtual bool OnKeyReleased(const Tizen::Ui::_Control& source, const Tizen::Ui::_KeyInfo& keyInfo);
        virtual void OnBoundsChanged(void);
        virtual void OnDraw(void);
        virtual result OnAttachedToMainTree(void);