fix check focus

Change-Id: I1bf2f387099d9dd00efe5f68385423b7b33008df

diff --git a/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp b/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp
index 247604d..567fe3b 100644 (file)
--- a/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp
@@ -62,7 +62,6 @@ _CheckButtonPresenter::_CheckButtonPresenter(void)
        , __onOffHandlerPosition(0.0f)
        , __onOffHandlerPressed(false)
        , __onOffHandlerMoved(false)
-       , __focusPrevStatus(_CHECK_BUTTON_STATUS_NORMAL)
 {
 
 }
@@ -2421,7 +2420,6 @@ _CheckButtonPresenter::OnTimerExpired(Timer& timer)
 void
 _CheckButtonPresenter::OnDrawFocus(void)
 {
-       __focusPrevStatus = __pCheckButton->GetCheckButtonStatus();
        if (__pCheckButton->GetCheckButtonStatus() != _CHECK_BUTTON_STATUS_DISABLED)
        {
                __pCheckButton->SetCheckButtonStatus(_CHECK_BUTTON_STATUS_HIGHLIGHTED);
@@ -2454,7 +2452,7 @@ _CheckButtonPresenter::OnFocusModeStateChanged(void)
 {
        if (__pCheckButton->GetCheckButtonStatus() != _CHECK_BUTTON_STATUS_DISABLED)
        {
-               __pCheckButton->SetCheckButtonStatus(__focusPrevStatus);
+               __pCheckButton->SetCheckButtonStatus(_CHECK_BUTTON_STATUS_NORMAL);
                __pCheckButton->Invalidate();
        }
 
@@ -2466,8 +2464,6 @@ _CheckButtonPresenter::OnFocusGained(const _Control& source)
 {
        if (__pCheckButton->IsFocusModeStateEnabled() == true)
        {
-               __focusPrevStatus = __pCheckButton->GetCheckButtonStatus();
-
                if (__pCheckButton->GetCheckButtonStatus() != _CHECK_BUTTON_STATUS_DISABLED)
                {
                        __pCheckButton->SetCheckButtonStatus(_CHECK_BUTTON_STATUS_HIGHLIGHTED);
@@ -2483,7 +2479,7 @@ _CheckButtonPresenter::OnFocusLost(const _Control& source)
 {
        if (__pCheckButton->GetCheckButtonStatus() != _CHECK_BUTTON_STATUS_DISABLED)
        {
-               __pCheckButton->SetCheckButtonStatus(__focusPrevStatus);
+               __pCheckButton->SetCheckButtonStatus(_CHECK_BUTTON_STATUS_NORMAL);
                __pCheckButton->Invalidate();
        }
 

diff --git a/src/ui/inc/FUiCtrl_CheckButtonPresenter.h b/src/ui/inc/FUiCtrl_CheckButtonPresenter.h
index 11d22fa..a214134 100644 (file)
--- a/src/ui/inc/FUiCtrl_CheckButtonPresenter.h
+++ b/src/ui/inc/FUiCtrl_CheckButtonPresenter.h
@@ -142,7 +142,6 @@ private:
        float __onOffHandlerPosition;
        bool __onOffHandlerPressed;
        bool __onOffHandlerMoved;
-       _CheckButtonStatus __focusPrevStatus;
 }; // _CheckButtonPresenter
 
 }}} // Tizen::Ui::Controls