Add diffence code in Edit focus logic & Remove indicator in FullScreen Keypad

Change-Id: Ia52ecd076a8b100614a5ee761d4ceee0b3b19e43

diff --git a/src/ui/controls/FUiCtrl_Edit.cpp b/src/ui/controls/FUiCtrl_Edit.cpp
index 307263b..c6875cc 100644 (file)
--- a/src/ui/controls/FUiCtrl_Edit.cpp
+++ b/src/ui/controls/FUiCtrl_Edit.cpp
@@ -2084,6 +2084,7 @@ _Edit::OnAncestorEnableStateChanged(const _Control& control)
                if (__internalFocus)
                {
                        _pEditPresenter->HideKeypad(true);
+                       __internalFocus = false;
                }
        }
 

diff --git a/src/ui/controls/FUiCtrl_Keypad.cpp b/src/ui/controls/FUiCtrl_Keypad.cpp
index 3875328..d0d9e45 100644 (file)
--- a/src/ui/controls/FUiCtrl_Keypad.cpp
+++ b/src/ui/controls/FUiCtrl_Keypad.cpp
@@ -86,13 +86,9 @@ _Keypad::CreateKeypadN(void)
        ClearLastResult();
 
        Dimension screenSize = _ControlManager::GetInstance()->GetScreenSize();
-       int portIndiHeight = 0;
-       int landIndiHeight = 0;
-       GET_SHAPE_CONFIG(FORM::INDICATOR_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, portIndiHeight);
-       GET_SHAPE_CONFIG(FORM::INDICATOR_MINIMIZE_HEIGHT, _CONTROL_ORIENTATION_LANDSCAPE, landIndiHeight);
 
-       Rectangle portBounds(0, 0, screenSize.width, screenSize.height - portIndiHeight);
-       Rectangle landBounds(0, 0, screenSize.width - landIndiHeight, screenSize.height);
+       Rectangle portBounds(0, 0, screenSize.width, screenSize.height);
+       Rectangle landBounds(0, 0, screenSize.width, screenSize.height);
        _EcoreEvas* pEcoreEvas = GetEcoreEvasMgr()->GetEcoreEvas();
 
        _Keypad* pKeypad = new (std::nothrow) _Keypad;
@@ -489,7 +485,6 @@ _Keypad::ChangeLayoutInternal(LayoutChangeState layoutChangeState)
 
        FloatRectangle bounds(0.0f, 0.0f, 0.0f, 0.0f);
        FloatRectangle keypadRect(0.0f, 0.0f, 0.0f, 0.0f);
-       float indicatorHeight = 0.0f;
        float clipboardHeight = 0.0f;
        bool isKeypadExist = false;
        bool isClipboardExist = false;
@@ -516,13 +511,6 @@ _Keypad::ChangeLayoutInternal(LayoutChangeState layoutChangeState)
                bounds.height = screenSize.width;
        }
 
-       if (pForm && pForm->IsIndicatorVisible())
-       {
-               indicatorHeight = pForm->GetIndicatorBoundsF().height;
-               bounds.y += indicatorHeight;
-               bounds.height -= indicatorHeight;
-       }
-
        SetResizable(true);
        SetMovable(true);
        r = SetBounds(bounds);
@@ -532,7 +520,7 @@ _Keypad::ChangeLayoutInternal(LayoutChangeState layoutChangeState)
 
        FloatRectangle editRect = bounds;
 
-       editRect.y = 0.0f;//_keypad's client doesn't include indicator
+       editRect.y = 0.0f;
 
        float footerHeight = 0.0f;
        GET_SHAPE_CONFIG(FOOTER::HEIGHT, orientation, footerHeight);
@@ -594,20 +582,6 @@ _Keypad::ChangeLayoutInternal(LayoutChangeState layoutChangeState)
        return r;
 }
 
-FloatRectangle
-_Keypad::GetIndicatorBounds(void) const
-{
-       float indicatorwidth = 0.0f;
-       float indicatorheight = 0.0f;
-
-       GET_SHAPE_CONFIG(FORM::INDICATOR_WIDTH, GetOrientation(), indicatorwidth);
-       GET_SHAPE_CONFIG(FORM::INDICATOR_HEIGHT, GetOrientation(), indicatorheight);
-
-       FloatRectangle rect (0.0f, 0.0f, indicatorwidth, indicatorheight);
-
-       return rect;
-}
-
 result
 _Keypad::OnAttachedToMainTree(void)
 {

diff --git a/src/ui/inc/FUiCtrl_Keypad.h b/src/ui/inc/FUiCtrl_Keypad.h
index 9642103..4a9bce8 100644 (file)
--- a/src/ui/inc/FUiCtrl_Keypad.h
+++ b/src/ui/inc/FUiCtrl_Keypad.h
@@ -113,7 +113,6 @@ private:
 
        result Dispose(void);
        result ChangeLayoutInternal(LayoutChangeState layoutChangeState);
-       Tizen::Graphics::FloatRectangle GetIndicatorBounds(void) const;
        _Button* CreateButtonItemN(int actionId, const Tizen::Base::String& text);
        _Button* CreateFooterBackButton(_Toolbar* pFooter);
        _Toolbar* CreateFooter(void);