add OnOwnerChange call back API

Change-Id: Ide524d89e5141a6c5a2fe66f58fb06b88070f6cb
Signed-off-by: DongJinJeon <dongjin2193.jeon@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_Popup.cpp b/src/ui/controls/FUiCtrl_Popup.cpp
index b5b6c1b..b30cc1b 100644 (file)
--- a/src/ui/controls/FUiCtrl_Popup.cpp
+++ b/src/ui/controls/FUiCtrl_Popup.cpp
@@ -48,7 +48,6 @@ namespace Tizen { namespace Ui { namespace Controls
 
 _Popup::_Popup(void)
        : _titleState(false)
-       , _ownerEnableState(false)
        , _titleText(L"")
        , _bgColor(Color(0xFFFFFFFF))
        , _titleTextColor(Color(0xFFFFFFFF))
@@ -465,13 +464,6 @@ _Popup::OnActivated(void)
                }
        }
 
-       _Control* pOwner = GetOwner();
-
-       if (pOwner != null)
-       {
-               pOwner->LockInputEvent();
-       }
-
        _Window::OnActivated();
 }
 
@@ -632,6 +624,21 @@ _Popup::OnTouchReleased(const _Control& source, const _TouchInfo& touchinfo)
        return __pPopupPresenter->OnTouchReleased(source, touchinfo);
 }
 
+void
+_Popup::OnOwnerChanged(_Control* pOldOwner)
+{
+       _Control* pOwner = GetOwner();
+
+       if (pOldOwner != null)
+       {
+               pOldOwner->UnlockInputEvent();
+       }
+
+       if (pOwner != null)
+       {
+               pOwner->LockInputEvent();
+       }
+}
 
 }}} // Tizen::Ui::Controls
 

diff --git a/src/ui/controls/FUiCtrl_ProgressPopup.cpp b/src/ui/controls/FUiCtrl_ProgressPopup.cpp
index 10577a1..edf9af5 100644 (file)
--- a/src/ui/controls/FUiCtrl_ProgressPopup.cpp
+++ b/src/ui/controls/FUiCtrl_ProgressPopup.cpp
@@ -589,13 +589,6 @@ _ProgressPopup::OnActivated(void)
                }
        }
 
-       _Control* pOwner = GetOwner();
-
-       if (pOwner != null)
-       {
-               pOwner->LockInputEvent();
-       }
-
        _Window::OnActivated();
 }
 

diff --git a/src/ui/inc/FUiCtrl_Popup.h b/src/ui/inc/FUiCtrl_Popup.h
index daca565..27d8c51 100644 (file)
--- a/src/ui/inc/FUiCtrl_Popup.h
+++ b/src/ui/inc/FUiCtrl_Popup.h
@@ -107,6 +107,7 @@ public:
        virtual void OnBoundsChanged(void);
        virtual result OnBoundsChanging(const Tizen::Graphics::Rectangle& bounds);
        virtual bool IsLayoutChangable(void) const;
+       virtual void OnOwnerChanged(_Control* pOldOwner);
 
 // Accessor
 public:
@@ -143,7 +144,6 @@ private:
 // Attribute
 protected:
        bool _titleState;
-       bool _ownerEnableState;
 
        Tizen::Base::String _titleText;