using setFocusNavigationEnabled() API for popup group controls.

Change-Id: I83a892b33675ab738bd1a1f1c3396679a1a2572a
Signed-off-by: kishorekumar Dachinamoorthy <kishore.d@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_MessageBox.cpp b/src/ui/controls/FUiCtrl_MessageBox.cpp
index ab46837..1b93ae9 100644 (file)
--- a/src/ui/controls/FUiCtrl_MessageBox.cpp
+++ b/src/ui/controls/FUiCtrl_MessageBox.cpp
@@ -119,6 +119,7 @@ _MessageBox::Initialize(const String& title, const String& text, MessageBoxStyle
        Color titleBgColor(0x00000000);
        Color buttonBgColor(0x00000000);
        _AccessibilityContainer* pContainer = null;
+       SetFocusNavigateEnabled(false);
 
        _titleText = title;
        _titleState = !(title.Equals(L"", false));
@@ -515,13 +516,6 @@ _MessageBox::OnSettingChanged(String& key)
        }
 }
 
-void
-_MessageBox::OnDrawFocus(void)
-{
-       __pMsgboxPresenter->OnDrawFocus();
-       return;
-}
-
 bool
 _MessageBox::OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element)
 {

diff --git a/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp b/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp
index 368c6f3..33b8725 100644 (file)
--- a/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp
@@ -1365,22 +1365,6 @@ _MessageBoxPresenter::OnTouchReleased(const _Control& source, const _TouchInfo&
        return true;
 }
 
-void
-_MessageBoxPresenter::OnDrawFocus(void)
-{
-       _ControlImpl* pImpl = null;
-       _Button* pButtonCore = null;
-
-       if (__pButtons[0] != null)
-       {
-               pImpl = _ControlImpl::GetInstance(*__pButtons[0]);
-               pButtonCore = dynamic_cast<_Button*>(&pImpl->GetCore());
-               __pButtons[0]->SetFocus();
-               __pMessageBox->SetFocusTraversalControl(pButtonCore, true);
-       }
-
-       return;
-}
 
 bool
 _MessageBoxPresenter::OnAccessibilityActionPerformed(const _AccessibilityContainer& control, const _AccessibilityElement& element)

diff --git a/src/ui/controls/FUiCtrl_Popup.cpp b/src/ui/controls/FUiCtrl_Popup.cpp
index c6d3c6b..9abb5ff 100644 (file)
--- a/src/ui/controls/FUiCtrl_Popup.cpp
+++ b/src/ui/controls/FUiCtrl_Popup.cpp
@@ -135,6 +135,7 @@ _Popup::Initialize(bool hasTitle, const Tizen::Graphics::FloatRectangle& bounds)
        _titleState = hasTitle;
        __bounds = bounds;
        SetClientBounds(GetPopupClientArea());
+       SetFocusNavigateEnabled(false);
 
        _PopupPresenter* pPresenter = new (std::nothrow) _PopupPresenter();
        SysTryReturn(NID_UI_CTRL, pPresenter != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
@@ -707,12 +708,6 @@ _Popup::OnBoundsChanged(void)
        }
 }
 
-void
-_Popup::OnDrawFocus(void)
-{
-       return;
-}
-
 bool
 _Popup::IsLayoutChangable(void) const
 {

diff --git a/src/ui/controls/FUiCtrl_ProgressPopup.cpp b/src/ui/controls/FUiCtrl_ProgressPopup.cpp
index a5fcc64..5ae7f19 100644 (file)
--- a/src/ui/controls/FUiCtrl_ProgressPopup.cpp
+++ b/src/ui/controls/FUiCtrl_ProgressPopup.cpp
@@ -163,6 +163,8 @@ _ProgressPopup::Initialize(bool cancelButton, bool transparent, const FloatRecta
        __buttonState = cancelButton;
        __isTransparent = transparent;
 
+       SetFocusNavigateEnabled(false);
+
        _ProgressPopupPresenter* pPresenter = new (std::nothrow) _ProgressPopupPresenter();
        SysTryReturn(NID_UI_CTRL, pPresenter != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
@@ -1076,23 +1078,6 @@ _ProgressPopup::OnSettingChanged(String& key)
 }
 
 void
-_ProgressPopup::OnDrawFocus(void)
-{
-       _ControlImpl* pImpl = null;
-       _Button* pButtonCore = null;
-
-       if (__pButton != null)
-       {
-               pImpl = _ControlImpl::GetInstance(*__pButton);
-               pButtonCore = dynamic_cast<_Button*>(&pImpl->GetCore());
-               __pButton->SetFocus();
-               SetFocusTraversalControl(pButtonCore, true);
-       }
-
-       return;
-}
-
-void
 _ProgressPopup::SetButtonText(void)
 {
        String buttonText;

diff --git a/src/ui/inc/FUiCtrl_MessageBox.h b/src/ui/inc/FUiCtrl_MessageBox.h
index 5b67210..76014e8 100644 (file)
--- a/src/ui/inc/FUiCtrl_MessageBox.h
+++ b/src/ui/inc/FUiCtrl_MessageBox.h
@@ -77,7 +77,6 @@ public:
 
        virtual void OnBoundsChanged(void);
        virtual void OnSettingChanged(Tizen::Base::String& key);
-       virtual void OnDrawFocus(void);
 
        virtual bool OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer& control, const _AccessibilityElement& element);

diff --git a/src/ui/inc/FUiCtrl_MessageBoxPresenter.h b/src/ui/inc/FUiCtrl_MessageBoxPresenter.h
index c4ac883..fa10d8c 100644 (file)
--- a/src/ui/inc/FUiCtrl_MessageBoxPresenter.h
+++ b/src/ui/inc/FUiCtrl_MessageBoxPresenter.h
@@ -75,7 +75,6 @@ public:
        virtual bool OnTouchPressed(const _Control& source, const _TouchInfo& touchinfo);
        virtual bool OnTouchMoved(const _Control& source, const _TouchInfo& touchinfo);
        virtual bool OnTouchReleased(const _Control& source, const _TouchInfo& touchinfo);
-       virtual void OnDrawFocus(void);
 
        bool OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo);
 

diff --git a/src/ui/inc/FUiCtrl_Popup.h b/src/ui/inc/FUiCtrl_Popup.h
index 3602f8a..1b5e865 100644 (file)
--- a/src/ui/inc/FUiCtrl_Popup.h
+++ b/src/ui/inc/FUiCtrl_Popup.h
@@ -107,7 +107,6 @@ public:
        virtual result OnBoundsChanging(const Tizen::Graphics::FloatRectangle& bounds);
 
        virtual void OnBoundsChanged(void);
-       virtual void OnDrawFocus(void);
        virtual bool IsLayoutChangable(void) const;
        virtual void OnOwnerChanged(_Control* pOldOwner);
        virtual void UpdateClientBounds(const Tizen::Graphics::FloatDimension& size, Tizen::Graphics::FloatRectangle& clientBounds);

diff --git a/src/ui/inc/FUiCtrl_ProgressPopup.h b/src/ui/inc/FUiCtrl_ProgressPopup.h
index 21d648f..15b4843 100644 (file)
--- a/src/ui/inc/FUiCtrl_ProgressPopup.h
+++ b/src/ui/inc/FUiCtrl_ProgressPopup.h
@@ -89,8 +89,6 @@ public:
        virtual bool OnTouchMoved(const _Control& source, const _TouchInfo& touchinfo);
        virtual void OnSettingChanged(Tizen::Base::String& key);
 
-       virtual void OnDrawFocus(void);
-
 public:
        result AddProgressPopupEventListener(const Tizen::Ui::Controls::_IProgressPopupEventListener& listener);