Revert "Fix N_SE-42846"

This reverts commit ec10dd3f55c1b57ff64ff9fd93a0f3a9ff961854

Change-Id: Idb48b1ff55f7735f1ec63ba31c0dae6b27f6848f

diff --git a/src/ui/controls/FUiCtrl_Edit.cpp b/src/ui/controls/FUiCtrl_Edit.cpp
index 96b5d59..a3f563d 100755 (executable)
--- a/src/ui/controls/FUiCtrl_Edit.cpp
+++ b/src/ui/controls/FUiCtrl_Edit.cpp
@@ -2143,8 +2143,23 @@ _Edit::OnAncestorEnableStateChanged(const _Control& control)
 
        if (!enableState)
        {
-               _pEditPresenter->ChangeToUnbindState();
-               __internalFocus = false;
+               if (_pEditPresenter->IsCopyPasteManagerExist())
+               {
+                       _pEditPresenter->InitializeCopyPasteManager();
+               }
+
+               if (__internalFocus)
+               {
+                       if (_pEditPresenter->IsKeypadEnabled())
+                       {
+                               _pEditPresenter->HideKeypad(true);
+                       }
+                       else
+                       {
+                               SetFocused(false);
+                       }
+                       __internalFocus = false;
+               }
        }
 
        Invalidate();
@@ -2160,8 +2175,23 @@ _Edit::OnAncestorVisibleStateChanged(const _Control& control)
 
        if (!visibleState)
        {
-               _pEditPresenter->ChangeToUnbindState();
-               __internalFocus = false;
+               if (_pEditPresenter->IsCopyPasteManagerExist())
+               {
+                       _pEditPresenter->InitializeCopyPasteManager();
+               }
+
+               if (__internalFocus)
+               {
+                       if (_pEditPresenter->IsKeypadEnabled())
+                       {
+                               _pEditPresenter->HideKeypad(true);
+                       }
+                       else
+                       {
+                               SetFocused(false);
+                       }
+                       __internalFocus = false;
+               }
        }
 
        Invalidate();

diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp
index ba2a07f..544ff9c 100755 (executable)
--- a/src/ui/controls/FUiCtrl_EditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp
@@ -6234,37 +6234,11 @@ _EditPresenter::OnFrameDeactivated(const _Frame& source)
 void
 _EditPresenter::OnFrameMinimized(const _Frame& source)
 {
-       return;
 }
 
 void
 _EditPresenter::OnFrameRestored(const _Frame& source)
 {
-       return;
-}
-
-void
-_EditPresenter::ChangeToUnbindState(void)
-{
-       if (IsCopyPasteManagerExist())
-       {
-               InitializeCopyPasteManager();
-       }
-
-       if (__pEdit->IsInternalFocused())
-       {
-               if (IsKeypadEnabled())
-               {
-                       HideKeypad(true);
-               }
-               else
-               {
-                       __pEdit->SetFocused(false);
-                       __isInputConnectionBound = false;//forcely set, OnFocusLost callback can be missed in special condition.
-               }
-       }
-
-       return;
 }
 
 bool

diff --git a/src/ui/inc/FUiCtrl_EditPresenter.h b/src/ui/inc/FUiCtrl_EditPresenter.h
index 34e5cc1..6504935 100755 (executable)
--- a/src/ui/inc/FUiCtrl_EditPresenter.h
+++ b/src/ui/inc/FUiCtrl_EditPresenter.h
@@ -141,7 +141,6 @@ public:
        virtual result Draw(Tizen::Graphics::Canvas& canvas);
        virtual result DrawCursor(Tizen::Graphics::Canvas& canvas, Tizen::Graphics::FloatRectangle& cursorRect, bool isCursorOpaque);
        virtual result DrawScrollBar(void);
-       virtual void ChangeToUnbindState(void);
        virtual bool OnFocusGained(void);
        virtual bool OnFocusLost(void);