Merge "modify Klockwork bug" into tizen_2.2

[platform/framework/native/uifw.git] / src / ui / controls / FUiCtrl_EditDatePresenter.cpp

diff --git a/src/ui/controls/FUiCtrl_EditDatePresenter.cpp b/src/ui/controls/FUiCtrl_EditDatePresenter.cpp
index b87a0bb..fc4e805 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditDatePresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditDatePresenter.cpp
@@ -945,7 +945,11 @@ _EditDatePresenter::SetFocusedElement(void)
        if (__isEnterKeyPressed)
        {
                __isEnterKeyPressed = false;
-               __isFocused = true;
+
+               if (__pEditDate->IsFocusModeStateEnabled())
+               {
+                       __isFocused = true;
+               }
        }
        int localeDateFormat =  dateTimeUtils.GetLocaleDateFormat();
        if (__focusId == DATETIME_ID_NONE)