Fix for issue N_SE-37785

Change-Id: I8ef35a0e82d6dc13fa58961114e36d5285a735ab
Signed-off-by: Kunal Sinha <kunal.sinha@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_Edit.cpp b/src/ui/controls/FUiCtrl_Edit.cpp
index 905eba2..87de922 100644 (file)
--- a/src/ui/controls/FUiCtrl_Edit.cpp
+++ b/src/ui/controls/FUiCtrl_Edit.cpp
@@ -238,6 +238,7 @@ _Edit::_Edit(void)
        , __internalFocus(false)
        , __isDestroyed(false)
        , __pTextFilter(null)
+       , __previousBounds()
 {
        for (int status = 0; status < EDIT_COLOR_MAX; status++)
        {
@@ -2011,7 +2012,19 @@ _Edit::OnBoundsChanged(void)
                        if (_pEditPresenter->IsUpdateInitialBounds())
                        {
                                FloatRectangle editBounds = GetBoundsF();
-                               _pEditPresenter->SetControlInitialBounds(editBounds);
+                               if (__previousBounds.height != editBounds.height || __previousBounds.width != editBounds.width)
+                               {
+                                       _pEditPresenter->SetControlInitialBounds(editBounds);
+                               }
+                               else
+                               {
+                                       _pEditPresenter->SetControlInitialPosition(FloatPoint(editBounds.x, editBounds.y));
+                               }
+                               __previousBounds = editBounds;
+                       }
+                       else
+                       {
+                               __previousBounds = GetBoundsF();
                        }
                }
 

diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp
index 6687942..931f727 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp
@@ -5420,6 +5420,13 @@ _EditPresenter::SetControlInitialBounds(FloatRectangle initBounds)
        __initialBounds = initBounds;
 }
 
+void
+_EditPresenter::SetControlInitialPosition(FloatPoint initPosition)
+{
+       __initialBounds.x = initPosition.x;
+       __initialBounds.y = initPosition.y;
+}
+
 bool
 _EditPresenter::IsUpdateInitialBounds(void)
 {

diff --git a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
index 387e735..1c4e4d8 100644 (file)
--- a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
@@ -1074,10 +1074,9 @@ _TokenEditPresenter::GetTokenAt(int index) const
 }
 
 int
-_TokenEditPresenter::GetTokenCount(bool aAppCalled) const
+_TokenEditPresenter::GetTokenCount(bool isInvokedByApp) const
 {
-
-       if (!aAppCalled)
+       if (!isInvokedByApp)
        {
                return __pTokenList->GetCount();
        }

diff --git a/src/ui/inc/FUiCtrl_Edit.h b/src/ui/inc/FUiCtrl_Edit.h
index f8259ee..e7c5f50 100644 (file)
--- a/src/ui/inc/FUiCtrl_Edit.h
+++ b/src/ui/inc/FUiCtrl_Edit.h
@@ -554,6 +554,7 @@ private:
        bool __internalFocus;
        bool __isDestroyed;
        IEditTextFilter* __pTextFilter;
+       Tizen::Graphics::FloatRectangle __previousBounds;
 }; // _Edit
 
 }}} // Tizen::Ui::Controls

diff --git a/src/ui/inc/FUiCtrl_EditPresenter.h b/src/ui/inc/FUiCtrl_EditPresenter.h
index 3ef9e71..f0f35f0 100644 (file)
--- a/src/ui/inc/FUiCtrl_EditPresenter.h
+++ b/src/ui/inc/FUiCtrl_EditPresenter.h
@@ -323,6 +323,7 @@ public:
        Tizen::Ui::Animations::_VisualElement* GetTextVisualElement(void);
        bool IsBounded(void) const;
        void SetControlInitialBounds(Tizen::Graphics::FloatRectangle initBounds);
+       void SetControlInitialPosition(Tizen::Graphics::FloatPoint initPosition);
        bool IsUpdateInitialBounds(void);
        virtual Tizen::Graphics::Rectangle GetTextBounds(void) const;
        virtual Tizen::Graphics::FloatRectangle GetTextBoundsF(void) const;

diff --git a/src/ui/inc/FUiCtrl_TokenEditPresenter.h b/src/ui/inc/FUiCtrl_TokenEditPresenter.h
index 56d9fea..6c7a815 100644 (file)
--- a/src/ui/inc/FUiCtrl_TokenEditPresenter.h
+++ b/src/ui/inc/FUiCtrl_TokenEditPresenter.h
@@ -32,11 +32,6 @@
 
 namespace Tizen { namespace Ui { namespace Controls
 {
-
-#define MAX_TOKEN_COUNT     100;
-const int ANIMATION_DURATION_BOUNDS = 167;
-const int ANIMATION_DURATION_OPACITY = 83;
-
 class _TokenEdit;
 
 class SineTimingFunction
@@ -74,7 +69,7 @@ public:
 
        Tizen::Base::String GetTokenAt(int index) const;
 
-       int GetTokenCount(bool aAppCalled = false) const;
+       int GetTokenCount(bool isInvokedByApp = false) const;
 
        int GetSelectedTokenIndex(void) const;
 
@@ -264,6 +259,11 @@ private:
 
        bool __isAnimationInProgress;
 
+       static const int ANIMATION_DURATION_BOUNDS = 167;
+
+       static const int ANIMATION_DURATION_OPACITY = 83;
+
+
 };     // _TokenEditPresenter
 
 }}} // Tizen::Ui::Controls