Init Tizen 2.2.1

[framework/osp/web.git] / src / controls / FWebCtrl_InputPickerPopup.h

diff --git a/src/controls/FWebCtrl_InputPickerPopup.h b/src/controls/FWebCtrl_InputPickerPopup.h
index 93151ce..462a942 100755 (executable)
--- a/src/controls/FWebCtrl_InputPickerPopup.h
+++ b/src/controls/FWebCtrl_InputPickerPopup.h
@@ -32,6 +32,7 @@
 #include <FUiIActionEventListener.h>
 #include <FUiIPropagatedKeyEventListener.h>
 #include <FUi_ControlManager.h>
+#include "FWebCtrl_WebPopup.h"
 
 namespace Tizen { namespace Ui
 {
@@ -62,8 +63,7 @@ enum _InputPickerMode
 
 
 class _InputPickerPopup
-       : public Tizen::Base::Object
-       , virtual public Tizen::Ui::IActionEventListener
+       : public _WebPopup
        , public Tizen::Ui::IPropagatedKeyEventListener
 {
 
@@ -89,9 +89,6 @@ public:
        Tizen::Base::String GetDate(void) const;
        Tizen::Graphics::Color GetColor(void) const;
 
-       result ShowPopup(void);
-       result HidePopup(void);
-
        virtual bool  OnKeyPressed (Tizen::Ui::Control &source, const Tizen::Ui::KeyEventInfo &keyEventInfo);
        virtual bool  OnKeyReleased (Tizen::Ui::Control &source, const Tizen::Ui::KeyEventInfo &keyEventInfo);
        virtual bool  OnPreviewKeyPressed (Tizen::Ui::Control &source, const Tizen::Ui::KeyEventInfo &keyEventInfo);
@@ -105,8 +102,6 @@ private:
 
        result CreatePopup(void);
 
-       result AddButton(_InputPickerButtonId buttonId);
-
        void CalculateColorPickerPopupSize(Tizen::Ui::_ControlOrientation orientation);
 
        result UpdateDate(void);
@@ -118,18 +113,15 @@ private:
 
 private:
 
-       std::unique_ptr<Tizen::Ui::Controls::Popup> __pPopup;
        Tizen::Ui::Controls::EditDate* __pEditDate;
        Tizen::Ui::Controls::EditTime* __pEditTime;
        Tizen::Ui::Controls::Button* __pSelectionBtn;
        Tizen::Ui::Controls::ColorPicker* __pColorPicker;
-
-       int __modal;
-       bool __isModal;
+       Tizen::Ui::Controls::Panel* __pButtonPanel;
 
        int __popupHeight;
        int __popupWidth;
-       int __btnHeight;
+       int __panelHeight;
 
        Ewk_Input_Type __inputType;
        Tizen::Base::String __dateStr;