add menu key, esc back behavior, remove warning message

Change-Id: I6d07a158c4982dab314b37e0e8791a33bc43f1c4

diff --git a/src/ui/FUi_EflUiEventManager.cpp b/src/ui/FUi_EflUiEventManager.cpp
index 7b17204..0e1d241 100644 (file)
--- a/src/ui/FUi_EflUiEventManager.cpp
+++ b/src/ui/FUi_EflUiEventManager.cpp
@@ -231,6 +231,7 @@ const _EvasConvertKeys keyTable[] =
        { _KEY_LEFT, "Left" },
        { _KEY_DOWN, "Down" },
        { _KEY_RIGHT, "Right" },
+       { _KEY_CONTEXT_MENU, "Menu" },
        { _KEY_COMMA, "less" }, /*virtual keypad <*/
        { _KEY_9, "parenleft" }, /*virtual keypad (*/
        { _KEY_0, "parenright" }, /*virtual keypad )*/

diff --git a/src/ui/FUi_SystemUtilImpl.cpp b/src/ui/FUi_SystemUtilImpl.cpp
index b8b9f30..65ffd1f 100644 (file)
--- a/src/ui/FUi_SystemUtilImpl.cpp
+++ b/src/ui/FUi_SystemUtilImpl.cpp
@@ -149,6 +149,7 @@ const ConvertKeys KeyCodeMap[] = {
        { _KEY_LEFT, "Left" },
        { _KEY_DOWN, "Down" },
        { _KEY_RIGHT, "Right" },
+       { _KEY_CONTEXT_MENU, "Menu" },
 
        //{ _KEY_SIDE_UP, "XF86AudioRaiseVolume" },
        //{ _KEY_SIDE_DOWN, "XF86AudioLowerVolume" },

diff --git a/src/ui/controls/FUiCtrl_Form.cpp b/src/ui/controls/FUiCtrl_Form.cpp
index 7f29ee4..a4b4e36 100644 (file)
--- a/src/ui/controls/FUiCtrl_Form.cpp
+++ b/src/ui/controls/FUiCtrl_Form.cpp
@@ -2500,30 +2500,6 @@ _Form::SetFooterBounds(Rectangle& bounds)
 }
 
 bool
-_Form::OnTouchPressed(const _Control& source, const _TouchInfo& touchinfo)
-{
-       return false;
-}
-
-bool
-_Form::OnTouchReleased(const _Control& source, const _TouchInfo& touchinfo)
-{
-       return false;
-}
-
-bool
-_Form::OnTouchMoved(const _Control& source, const _TouchInfo& touchinfo)
-{
-       return false;
-}
-
-bool
-_Form::OnTouchCanceled(const _Control & source, const _TouchInfo & touchinfo)
-{
-       return false;
-}
-
-bool
 _Form::OnMousePressed(const _Control& source, const _MouseInfo& mouseinfo)
 {
        return false;
@@ -2551,6 +2527,39 @@ _Form::OnMouseReleased(const _Control& source, const _MouseInfo& mouseinfo)
        return true;
 }
 
+bool
+_Form::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo)
+{
+       return false;
+}
+
+bool
+_Form::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
+{
+       if (keyInfo.GetKeyCode() == _KEY_ESC)
+       {
+               _Toolbar* pToolbar = GetFooter();
+               if (pToolbar == null)
+               {
+                       return null;
+               }
+
+               if (pToolbar->IsButtonSet(BACK_BUTTON))
+               {
+                       void* pData = GetUserData();
+                       if (pData)
+                       {
+                               _FormImpl* pDataImpl = static_cast<_FormImpl*>(pData);
+                               pDataImpl->OnFormBackRequested(*this);
+                       }
+               }
+
+               return true;
+       }
+
+       return false;
+}
+
 result
 _Form::SetFooterBounds(FloatRectangle& bounds)
 {

diff --git a/src/ui/inc/FUiCtrl_Form.h b/src/ui/inc/FUiCtrl_Form.h
index 8f220ad..82de4b8 100644 (file)
--- a/src/ui/inc/FUiCtrl_Form.h
+++ b/src/ui/inc/FUiCtrl_Form.h
@@ -86,9 +86,6 @@ class _IFormOrientationStatusEventListener
 class _OSP_EXPORT_ _Form
        : public _Control
        , public _IActionEventListener
-       , virtual public Tizen::Base::Runtime::IEventListener
-       , virtual public Tizen::Ui::_IUiEventListener
-       , virtual public Tizen::Ui::_IUiEventPreviewer
 {
 // Lifecycle
 public:
@@ -184,13 +181,12 @@ public:
        result SetIndicatorShowState(bool state, bool hide = false);
        result SetIndicatorOpacity(_IndicatorOpacity opacity);
 
-       virtual bool OnTouchPressed(const _Control& source, const _TouchInfo& touchinfo);
-       virtual bool OnTouchReleased(const _Control& source, const _TouchInfo& touchinfo);
-       virtual bool OnTouchMoved(const _Control& source, const _TouchInfo& touchinfo);
-       virtual bool OnTouchCanceled(const _Control& source, const _TouchInfo& touchinfo);
        virtual bool OnMousePressed(const _Control& source, const _MouseInfo& mouseinfo);
        virtual bool OnMouseReleased(const _Control& source, const _MouseInfo& mouseinfo);
 
+       virtual bool OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo);
+       virtual bool OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo);
+
        result AdjustClientBounds(void);
 
        result AddActionEventListener(Tizen::Ui::Controls::_IActionEventListener& listener);

diff --git a/src/ui/inc/FUi_UiKeyEvent.h b/src/ui/inc/FUi_UiKeyEvent.h
index ee41341..4777887 100644 (file)
--- a/src/ui/inc/FUi_UiKeyEvent.h
+++ b/src/ui/inc/FUi_UiKeyEvent.h
@@ -555,7 +555,7 @@ enum _KeyCode
        /**
        *       The menu key
        */
-       _KEY_MENU_BUTTON = KEY_CONTEXT_MENU,
+       _KEY_CONTEXT_MENU = KEY_CONTEXT_MENU,
 
        /**
        *       The minus key