Focus Ui Message Box

Change-Id: Ic58ba78c8d6c17776f7b5fba9ef92ef44f8a3797
Signed-off-by: Ayush <ayush.sriv@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_MessageBox.cpp b/src/ui/controls/FUiCtrl_MessageBox.cpp
index 80d11f1..ab46837 100644 (file)
--- a/src/ui/controls/FUiCtrl_MessageBox.cpp
+++ b/src/ui/controls/FUiCtrl_MessageBox.cpp
@@ -515,6 +515,13 @@ _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 167c430..5170f68 100644 (file)
--- a/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp
@@ -1368,6 +1368,23 @@ _MessageBoxPresenter::OnTouchReleased(const _Control& source, const _TouchInfo&
        return true;
 }
 
+void
+_MessageBoxPresenter::OnDrawFocus(void)
+{
+       _ControlImpl* pImpl = null;
+       _Button* pButtonCore = null;
+
+       if (__pButtons != 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 8c8d892..c6d3c6b 100644 (file)
--- a/src/ui/controls/FUiCtrl_Popup.cpp
+++ b/src/ui/controls/FUiCtrl_Popup.cpp
@@ -705,7 +705,12 @@ _Popup::OnBoundsChanged(void)
                        _pTitleTextAccessibilityElement->SetBounds(__pPopupPresenter->GetTitleTextBounds());
                }
        }
+}
 
+void
+_Popup::OnDrawFocus(void)
+{
+       return;
 }
 
 bool

diff --git a/src/ui/controls/FUiCtrl_ProgressPopup.cpp b/src/ui/controls/FUiCtrl_ProgressPopup.cpp
index 09d05ea..a5fcc64 100644 (file)
--- a/src/ui/controls/FUiCtrl_ProgressPopup.cpp
+++ b/src/ui/controls/FUiCtrl_ProgressPopup.cpp
@@ -1076,6 +1076,23 @@ _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 76014e8..5b67210 100644 (file)
--- a/src/ui/inc/FUiCtrl_MessageBox.h
+++ b/src/ui/inc/FUiCtrl_MessageBox.h
@@ -77,6 +77,7 @@ 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 96ed378..b609192 100644 (file)
--- a/src/ui/inc/FUiCtrl_MessageBoxPresenter.h
+++ b/src/ui/inc/FUiCtrl_MessageBoxPresenter.h
@@ -75,6 +75,7 @@ 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 1b5e865..3602f8a 100644 (file)
--- a/src/ui/inc/FUiCtrl_Popup.h
+++ b/src/ui/inc/FUiCtrl_Popup.h
@@ -107,6 +107,7 @@ 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 15b4843..21d648f 100644 (file)
--- a/src/ui/inc/FUiCtrl_ProgressPopup.h
+++ b/src/ui/inc/FUiCtrl_ProgressPopup.h
@@ -89,6 +89,8 @@ 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);