fixed bug (The scroll does not work on flicking)

Change-Id: I1060ddb5b2f5fa9ee34285628e4a8306c49f7aca

diff --git a/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp b/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp
index 01f84e0..bd3a0e6 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp
+++ b/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp
@@ -709,6 +709,7 @@ _EditCopyPasteHandler::AdjustBounds(void)
        FloatPoint checkPoint(0.0f, 0.0f);
        _Edit* pEdit = __pCopyPasteManager->GetEdit();
        _EditPresenter* pEditPresenter = pEdit->GetPresenter();
+       TextObject* pTextObject = pEditPresenter->GetTextObject();
 
        if (__singleHandler)
        {
@@ -724,7 +725,15 @@ _EditCopyPasteHandler::AdjustBounds(void)
                rect.x = cursorRect.x;
                rect.y = cursorRect.y + cursorRect.height;
 
-               checkPoint = FloatPoint(cursorRect.x + cursorRect.width/2.0f, cursorRect.y + cursorRect.height);
+
+               if (pTextObject->GetAlignment() & TEXT_OBJECT_ALIGNMENT_RIGHT)
+               {
+                       checkPoint = FloatPoint(cursorRect.x, cursorRect.y + cursorRect.height);
+               }
+               else
+               {
+                       checkPoint = FloatPoint(cursorRect.x + cursorRect.width/2.0f, cursorRect.y + cursorRect.height);
+               }
 
                if (__leftHandler)
                {

diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp
index 00d1cc4..432ea16 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp
@@ -2674,10 +2674,7 @@ _EditPresenter::ScrollContents(float moveY)
                        StopFlickTimer();
                }
 
-               if (__pScrollBar->IsOnFadeEffect() == true)
-               {
-                       __pScrollBar->SetScrollVisibility(false);
-               }
+               __pScrollBar->SetScrollVisibility(false);
 
                return E_SYSTEM;
        }
@@ -2688,10 +2685,7 @@ _EditPresenter::ScrollContents(float moveY)
                        StopFlickTimer();
                }
 
-               if (__pScrollBar->IsOnFadeEffect() == true)
-               {
-                       __pScrollBar->SetScrollVisibility(false);
-               }
+               __pScrollBar->SetScrollVisibility(false);
 
                return E_SYSTEM;
        }
@@ -2741,96 +2735,6 @@ _EditPresenter::ScrollContents(float moveY)
        return E_SUCCESS;
 }
 
-result
-_EditPresenter::ScrollContents(int moveY)
-{
-       int moveLine = 0;
-       int firstDisplayY = 0;
-       int effectDistance = moveY;
-
-       int totalHeight = __pTextObject->GetTotalHeight();
-       int newFirstDisplayY = firstDisplayY = __pTextObject->GetFirstDisplayPositionY();
-       int currentCursorLine = 0;
-
-       if (__pTextObject->GetTextLength() < 1)
-       {
-               return E_SYSTEM;
-       }
-
-       if (__pScrollBar && __pScrollBar->GetScrollPosition() == 0 && effectDistance < 0)
-       {
-               if (__pFlickAnimationTimer)
-               {
-                       StopFlickTimer();
-               }
-
-               if (__pScrollBar->IsOnFadeEffect() == true)
-               {
-                       __pScrollBar->SetScrollVisibility(false);
-               }
-
-               return E_SYSTEM;
-       }
-       else if (__pScrollBar && __pScrollBar->GetScrollPosition() != 0 && __pScrollBar->GetScrollPosition() == __previousScrollBarMaxPos && effectDistance > 0)
-       {
-               if (__pFlickAnimationTimer)
-               {
-                       StopFlickTimer();
-               }
-
-               if (__pScrollBar->IsOnFadeEffect() == true)
-               {
-                       __pScrollBar->SetScrollVisibility(false);
-               }
-
-               return E_SYSTEM;
-       }
-
-       if (__pTextObject->GetCursorIndex() == __pTextObject->GetTextLength())
-       {
-               currentCursorLine = __pTextObject->GetTotalLineCount() - 1;
-       }
-       else
-       {
-               currentCursorLine = __pTextObject->GetLineIndexAtTextIndex(__pTextObject->GetCursorIndex());
-       }
-
-       if (currentCursorLine == -1)
-       {
-               return E_SYSTEM;
-       }
-
-       if (currentCursorLine < 0)
-       {
-               currentCursorLine = 0;
-       }
-
-       newFirstDisplayY += moveY;
-
-       if (newFirstDisplayY > (totalHeight - _CoordinateSystemUtils::ConvertToInteger(__textObjectBounds.height)))
-       {
-               newFirstDisplayY = totalHeight - _CoordinateSystemUtils::ConvertToInteger(__textObjectBounds.height);
-       }
-
-       if (newFirstDisplayY < 0)
-       {
-               newFirstDisplayY = 0;
-       }
-
-       moveLine = __pTextObject->GetLineIndexAtPositionY(newFirstDisplayY);
-
-       __pTextObject->SetFirstDisplayLineIndex(moveLine);
-       __pTextObject->SetFirstDisplayPositionY(newFirstDisplayY);
-
-       __isCursorOpaque = false;
-       if (__isCopyPasteManagerExist)
-       {
-               __pCopyPasteManager->AdjustBounds();
-       }
-
-       return E_SUCCESS;
-}
-
 bool
 _EditPresenter::OnTouchPressed(const _Control& source, const _TouchInfo& touchInfo)
 {
@@ -5596,8 +5500,6 @@ _EditPresenter::OnFocusLost(void)
                return false;
        }
 
-       ReplaceTextIntoPasswordHyphenString();
-
        if (__isClipboardExist)
        {
                if (__pClipboard)
@@ -5621,6 +5523,8 @@ _EditPresenter::OnFocusLost(void)
                HideKeypad();
        }
 
+       ReplaceTextIntoPasswordHyphenString();
+
        __pEdit->Invalidate();
 
        return true;
@@ -9029,11 +8933,6 @@ _EditPresenter::StartFlickAnimation(const FloatPoint& flickPosition, int flickTi
                return E_SUCCESS;
        }
 
-       if (__pScrollBar->IsOnFadeEffect() == true)
-       {
-               __pScrollBar->CancelFadeEffect();
-       }
-
        if (InitializeFlickAnimation() != E_SUCCESS)
        {
                return E_SYSTEM;
@@ -9122,9 +9021,9 @@ _EditPresenter::ScrollOnFlick(float moveDistanceY)
                return false;
        }
 
-       if (__pScrollBar->IsOnFadeEffect() == true)
+       if (!__pScrollBar->GetScrollVisibility())
        {
-               __pScrollBar->CancelFadeEffect();
+               __pScrollBar->SetScrollVisibility(true);
        }
 
        ScrollContents(moveDistanceY);

diff --git a/src/ui/inc/FUiCtrl_EditPresenter.h b/src/ui/inc/FUiCtrl_EditPresenter.h
index adea1e6..d5ad4c6 100644 (file)
--- a/src/ui/inc/FUiCtrl_EditPresenter.h
+++ b/src/ui/inc/FUiCtrl_EditPresenter.h
@@ -299,7 +299,6 @@ public:
        bool IsCopyPasteHandle(const _Control& control) const;
        Tizen::Graphics::_Text::TextObject* GetTextObject(void) const;
        EditStatus GetCurrentStatus(void) const;
-       result ScrollContents(int moveY);
        result ScrollContents(float moveY);
        virtual void DrawText(void);
        virtual bool IsGuideTextActivated(void) const;