Fix N_SE-38292

Change-Id: I51b18045e6a1f4b61f00523d4b918c514e9140a7

diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp
index c3305e6..433cf82 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp
@@ -314,14 +314,6 @@ _EditPresenter::OnInputConnectionPanelShowStateChanged(InputConnection& source,
                                SetFooterVisible(true);// must be called ahead of DeflateClientRectHeight
                        }
 
-                       if (!__pEdit->IsFullScreenKeypadEdit())
-                       {
-                               if (__pParentForm)
-                               {
-                                       __pParentForm->SetKeypadShowState(false);
-                               }
-                       }
-
                        ChangeLayoutInternal(__pEdit->GetOrientation());
 
                        if (__isClipboardExist)
@@ -332,6 +324,15 @@ _EditPresenter::OnInputConnectionPanelShowStateChanged(InputConnection& source,
                        {
                                AdjustParentPanelHeight(true);
                        }
+
+                       if (!__pEdit->IsFullScreenKeypadEdit())
+                       {
+                               if (__pParentForm)
+                               {
+                                       __pParentForm->SetKeypadShowState(false);
+                                       __pParentForm->Draw();
+                               }
+                       }
                }
                else
                {
@@ -359,6 +360,15 @@ _EditPresenter::OnInputConnectionPanelShowStateChanged(InputConnection& source,
                                {
                                        AdjustParentPanelHeight(true);
                                }
+
+                               if (!__pEdit->IsFullScreenKeypadEdit())
+                               {
+                                       if (__pParentForm)
+                                       {
+                                               __pParentForm->SetKeypadShowState(false);
+                                               __pParentForm->Draw();
+                                       }
+                               }
                        }
                        else// called by focus move or HideKeypad() api call
                        {
@@ -379,19 +389,15 @@ _EditPresenter::OnInputConnectionPanelShowStateChanged(InputConnection& source,
                                        SysLog(NID_UI_CTRL, "[EDIT] Form deflate RESET!!!!!!!!!!");
                                        __pParentForm->DeflateClientRectHeight(0.0f);
                                }
-                       }
-               }
 
-               if (!__pEdit->IsFullScreenKeypadEdit())
-               {
-                       if (__pParentForm)
-                       {
-                               if (!__isUSBKeyboardConnected)
+                               if (!__pEdit->IsFullScreenKeypadEdit())
                                {
-                                       __pParentForm->SetKeypadShowState(false);
+                                       if (__pParentForm)
+                                       {
+                                               __pParentForm->SetKeypadShowState(false);
+                                               __pParentForm->Draw();
+                                       }
                                }
-
-                               __pParentForm->Draw();
                        }
                }