remove useless API (FloatConverting) & fixed bug

Change-Id: If8e74ebbcffb7e49693ede97a71f5d1a6718a22f

diff --git a/src/ui/controls/FUiCtrl_Edit.cpp b/src/ui/controls/FUiCtrl_Edit.cpp
index 05c2f54..8bb9d1b 100644 (file)
--- a/src/ui/controls/FUiCtrl_Edit.cpp
+++ b/src/ui/controls/FUiCtrl_Edit.cpp
@@ -1859,12 +1859,6 @@ _Edit::GetCurrentLanguage(LanguageCode& language) const
 }
 
 bool
-_Edit::CalculateAbsoluteCursorBounds(int index, Rectangle& absCursorRect)
-{
-       return _pEditPresenter->CalculateAbsoluteCursorBounds(index, absCursorRect);
-}
-
-bool
 _Edit::CalculateAbsoluteCursorBounds(int index, FloatRectangle& absCursorRect)
 {
        return _pEditPresenter->CalculateAbsoluteCursorBounds(index, absCursorRect);
@@ -2610,12 +2604,6 @@ _Edit::SetKeypadCommandButton(CommandButtonPosition position, const String& text
 }
 
 result
-_Edit::GetKeypadBounds(Rectangle& rect) const
-{
-       return _pEditPresenter->GetKeypadBounds(rect);
-}
-
-result
 _Edit::GetKeypadBounds(FloatRectangle& rect) const
 {
        return _pEditPresenter->GetKeypadBounds(rect);
@@ -2787,24 +2775,12 @@ _Edit::GetKeypadCommandButtonActionId(CommandButtonPosition position) const
 }
 
 result
-_Edit::GetCursorBounds(bool isAbsRect, Rectangle& cursorBounds) const
-{
-       return _pEditPresenter->GetCursorBounds(isAbsRect, cursorBounds);
-}
-
-result
 _Edit::GetCursorBounds(bool isAbsRect, FloatRectangle& cursorBounds) const
 {
        return _pEditPresenter->GetCursorBounds(isAbsRect, cursorBounds);
 }
 
 int
-_Edit::GetCursorPositionAt(const Point& touchPoint) const
-{
-       return _pEditPresenter->GetCursorPositionAt(touchPoint);
-}
-
-int
 _Edit::GetCursorPositionAt(const FloatPoint& touchPoint) const
 {
        return _pEditPresenter->GetCursorPositionAt(touchPoint);

diff --git a/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp b/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp
index 85e1d05..0d77526 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp
+++ b/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp
@@ -1222,13 +1222,13 @@ _EditCopyPasteHandler::OnTouchReleased(const _Control& source, const _TouchInfo&
 {
        CheckReverseStatus();
        __isTouchPressed = false;
-       __isTouchMoving = false;
        __absoluteTouchPressedPoint = FloatPoint(0.0f, 0.0f);
        DestroyCopyPasteMagnifier();
        __pCopyPasteManager->CreateCopyPastePopup();
        __pCopyPasteManager->Show();
        __pCopyPasteManager->SendTextBlockEvent();
        Invalidate();
+       __isTouchMoving = false;
        return true;
 }
 
@@ -2341,16 +2341,6 @@ _EditCopyPasteManager::RefreshBlock(bool isLeftHandle)
        AdjustBounds();
 }
 
-Rectangle
-_EditCopyPasteManager::GetCursorBounds(bool isAbsRect) const
-{
-       Rectangle cursorBounds;
-
-       __pEdit->GetCursorBounds(isAbsRect, cursorBounds);
-
-       return cursorBounds;
-}
-
 FloatRectangle
 _EditCopyPasteManager::GetCursorBoundsF(bool isAbsRect) const
 {
@@ -2362,12 +2352,6 @@ _EditCopyPasteManager::GetCursorBoundsF(bool isAbsRect) const
 }
 
 int
-_EditCopyPasteManager::GetCursorPositionAt(const Point& touchPoint) const
-{
-       return __pEdit->GetCursorPositionAt(touchPoint);
-}
-
-int
 _EditCopyPasteManager::GetCursorPositionAt(const FloatPoint& touchPoint) const
 {
        return __pEdit->GetCursorPositionAt(touchPoint);

diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp
index a78610d..649c8f8 100755 (executable)
--- a/src/ui/controls/FUiCtrl_EditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp
@@ -2545,68 +2545,6 @@ _EditPresenter::IsTextBlockedInTokenEdit(void) const
 }
 
 int
-_EditPresenter::GetCursorPositionAt(const Point& touchPoint) const
-{
-       Point cursorPoint;
-       int cursorPos = -1;
-
-       Rectangle textObjectBounds = _CoordinateSystemUtils::ConvertToInteger(__textObjectBounds);
-       Rectangle textBoxBounds = _CoordinateSystemUtils::ConvertToInteger(__textBoxBounds);
-
-       if (!(__pEdit->GetEditStyle() & EDIT_STYLE_TOKEN) == false)
-       {
-               if (IsTextBlockedInTokenEdit())
-               {
-                       textObjectBounds = GetTextBounds();
-               }
-       }
-
-       if (textObjectBounds.Contains(touchPoint))
-       {
-               cursorPoint.x = touchPoint.x - textObjectBounds.x;
-               cursorPoint.y = touchPoint.y - textObjectBounds.y;
-       }
-       else if (textBoxBounds.Contains(touchPoint))
-       {
-               if (touchPoint.y <= textObjectBounds.y)
-               {
-                       cursorPoint.y = textObjectBounds.y + 1;
-               }
-               else if (touchPoint.y >= (textObjectBounds.y + textObjectBounds.height))
-               {
-                       cursorPoint.y = textObjectBounds.y + textObjectBounds.height - 1;
-               }
-               else
-               {
-                       cursorPoint.y = touchPoint.y;
-               }
-
-               if (touchPoint.x <= textObjectBounds.x)
-               {
-                       cursorPoint.x = textObjectBounds.x + 1;
-               }
-               else if (touchPoint.x >= (textObjectBounds.x + textObjectBounds.width))
-               {
-                       cursorPoint.x = textObjectBounds.x + textObjectBounds.width - 1;
-               }
-               else
-               {
-                       cursorPoint.x = touchPoint.x;
-               }
-               cursorPoint.y -= textObjectBounds.y;
-               cursorPoint.x -= textObjectBounds.x;
-       }
-       else
-       {
-               return cursorPos;
-       }
-
-       cursorPos = __pTextObject->GetTextIndexFromPosition(cursorPoint.x, cursorPoint.y);
-
-       return cursorPos;
-}
-
-int
 _EditPresenter::GetCursorPositionAt(const FloatPoint& touchPoint) const
 {
        FloatPoint cursorPoint;
@@ -2928,85 +2866,6 @@ _EditPresenter::CalculateCursorBounds(const FloatRectangle& textBounds, FloatRec
 }
 
 result
-_EditPresenter::CalculateCursorBounds(const Rectangle& textBounds, Rectangle& cursorBounds, int cursorPos)
-{
-       int cursorWidth = 0;
-       int cursorHeight = 0;
-       int cursorAbsX = 0;
-       int cursorAbsY = 0;
-       int cursorRelativeX = 0;
-       int cursorRelativeY = 0;
-
-       __pTextObject->SetBounds(textBounds);
-
-       if (cursorPos == -1)
-       {
-               cursorPos = __pTextObject->GetCursorIndex();
-       }
-
-       if (__pTextObject->GetTextPositionInfoAt(cursorPos, cursorWidth, cursorHeight, cursorAbsX, cursorAbsY, cursorRelativeX, cursorRelativeY) != E_SUCCESS)
-       {
-               return E_SYSTEM;
-       }
-
-       cursorBounds.x = cursorRelativeX;
-       cursorBounds.y = cursorRelativeY;
-       GET_SHAPE_CONFIG(EDIT::CURSOR_WIDTH, __pEdit->GetOrientation(), cursorBounds.width);
-       cursorBounds.height = cursorHeight;
-
-       if (cursorBounds.y == 0)
-       {
-               cursorBounds.y = _CoordinateSystemUtils::ConvertToInteger(__textObjectBounds.y);
-       }
-
-       if (cursorBounds.height == 0)
-       {
-               cursorBounds.height =  _CoordinateSystemUtils::ConvertToInteger(__textObjectBounds.height);
-       }
-
-       if (cursorBounds.height == 0)
-       {
-               return E_SYSTEM;
-       }
-
-       if (cursorBounds.y < textBounds.y)
-       {
-               int cursorHeightDiff = textBounds.y - cursorBounds.y;
-               cursorBounds.y = textBounds.y;
-               cursorBounds.height -= cursorHeightDiff;
-       }
-
-       if (cursorBounds.y + cursorBounds.height > textBounds.y + textBounds.height)
-       {
-               int cursorHeightDiff = cursorBounds.y + cursorBounds.height - textBounds.y - textBounds.height - 1;
-               cursorBounds.height -= cursorHeightDiff;
-       }
-
-       if (cursorBounds.x == textBounds.x + textBounds.width)
-       {
-               cursorBounds.x -= 1;
-       }
-       else if (cursorBounds.x > textBounds.x + textBounds.width)
-       {
-               cursorBounds.x = textBounds.x + textBounds.width;
-               return E_SYSTEM;
-       }
-
-       if (__pTextObject->GetBlock() == false)
-       {
-               cursorBounds.x -= 1;
-               if (cursorBounds.x < textBounds.x)
-               {
-                       cursorBounds.x = textBounds.x;
-               }
-       }
-
-       GET_SHAPE_CONFIG(EDIT::CURSOR_WIDTH, __pEdit->GetOrientation(), cursorBounds.width);
-
-       return E_SUCCESS;
-}
-
-result
 _EditPresenter::ScrollContents(float moveY)
 {
        int moveLine = 0;
@@ -6444,71 +6303,6 @@ _EditPresenter::IsContained(FloatRectangle& paramRect) const
 }
 
 result
-_EditPresenter::CalculateAbsoluteCursorBounds(int index, Rectangle& absCursorBounds)
-{
-       int cursorAbsX = 0;
-       int cursorAbsY = 0;
-       int cursorWidth = 0;
-       int cursorHeight = 0;
-       int cursorRelativeX = 0;
-       int cursorRelativeY = 0;
-
-       Rectangle absBounds = __pEdit->GetAbsoluteBounds();
-
-       __pTextObject->SetBounds(GetTextBounds());
-       if (__pTextObject->GetTextPositionInfoAt(index, cursorWidth, cursorHeight, cursorAbsX, cursorAbsY, cursorRelativeX, cursorRelativeY) != E_SUCCESS)
-       {
-               return E_SYSTEM;
-       }
-
-       absCursorBounds.x = absBounds.x + cursorRelativeX;
-
-       if (__pEdit->GetEditStyle() & EDIT_STYLE_SINGLE_LINE)
-       {
-               Rectangle tempBounds;
-               GetCursorBounds(true, tempBounds);
-               absCursorBounds.y = tempBounds.y;
-       }
-       else
-       {
-               absCursorBounds.y = absBounds.y + cursorRelativeY;
-       }
-
-       absCursorBounds.width = cursorWidth;
-
-       if (cursorHeight > 0)
-       {
-               absCursorBounds.height = cursorHeight;
-       }
-       else
-       {
-               absCursorBounds.height = __pTextObject->GetLineHeightAt(0);
-       }
-
-       return E_SUCCESS;
-}
-
-result
-_EditPresenter::GetCursorBounds(bool isAbsRect, Rectangle& cursorBounds)
-{
-       if (__isInitialized == false)
-       {
-               return E_SYSTEM;
-       }
-
-       CalculateCursorBounds(GetTextBounds(), cursorBounds);
-
-       if (isAbsRect)
-       {
-               Rectangle absBounds = __pEdit->GetAbsoluteBounds();
-               cursorBounds.x += absBounds.x;
-               cursorBounds.y += absBounds.y;
-       }
-
-       return E_SUCCESS;
-}
-
-result
 _EditPresenter::CalculateAbsoluteCursorBounds(int index, FloatRectangle& absCursorBounds)
 {
        float cursorAbsX = 0.0f;
@@ -6523,10 +6317,10 @@ _EditPresenter::CalculateAbsoluteCursorBounds(int index, FloatRectangle& absCurs
        __pTextObject->SetBounds(GetTextBoundsF());
        if (index != __cursorPos)
        {
-       if (__pTextObject->GetTextPositionInfoAt(index, cursorWidth, cursorHeight, cursorAbsX, cursorAbsY, cursorRelativeX, cursorRelativeY) != E_SUCCESS)
-       {
-               return E_SYSTEM;
-       }
+               if (__pTextObject->GetTextPositionInfoAt(index, cursorWidth, cursorHeight, cursorAbsX, cursorAbsY, cursorRelativeX, cursorRelativeY) != E_SUCCESS)
+               {
+                       return E_SYSTEM;
+               }
        }
        else
        {
@@ -6939,27 +6733,6 @@ _EditPresenter::DeleteFullscreenKeypad(void)
 }
 
 result
-_EditPresenter::GetKeypadBounds(Rectangle& bounds) const
-{
-       if (__pInputConnection == null)
-       {
-               return E_SYSTEM;
-       }
-
-       bounds = __pInputConnection->GetInputPanelBounds();
-
-       _CoordinateSystem* pCoordSystem = _CoordinateSystem::GetInstance();
-       SysTryReturnResult(NID_UI_CTRL, pCoordSystem, E_SYSTEM, "[EDIT] Coordinate system load failed.");
-
-       _ICoordinateSystemTransformer* pXformer = pCoordSystem->GetInverseTransformer();
-       SysTryReturnResult(NID_UI_CTRL, pXformer, E_SYSTEM, "[EDIT] Coordinate system load failed.");
-
-       bounds = pXformer->Transform(bounds);
-
-       return E_SUCCESS;
-}
-
-result
 _EditPresenter::GetKeypadBounds(FloatRectangle& bounds) const
 {
        if (__pInputConnection == null)
@@ -7765,51 +7538,6 @@ CATCH:
 }
 
 result
-_EditPresenter::DrawCursor(Canvas& canvas, Rectangle& cursorBounds, bool isCursorOpaque)
-{
-       result r = E_SUCCESS;
-
-       if (__isCursorDisabled == false)
-       {
-               Color cursorColor;
-               GET_COLOR_CONFIG(EDIT::CURSOR_NORMAL, cursorColor);
-
-               if (__isCursorInitialized)
-               {
-                       cursorBounds.SetPosition(0, 0);
-
-                       if (canvas.GetBackgroundColor() != cursorColor)
-                       {
-                               canvas.FillRectangle(cursorColor, cursorBounds);
-                       }
-
-                       if (isCursorOpaque)
-                       {
-                               __pCursorVisualElement->SetOpacity(1.0f);
-                       }
-                       else
-                       {
-                               __pCursorVisualElement->SetOpacity(0);
-                       }
-               }
-               else
-               {
-                       cursorBounds.SetPosition(0, 0);
-
-                       canvas.FillRectangle(cursorColor, cursorBounds);
-                       __isCursorInitialized = true;
-
-               }
-       }
-       else
-       {
-               __pCursorVisualElement->SetOpacity(0);
-       }
-
-       return r;
-}
-
-result
 _EditPresenter::DrawCursor(Canvas& canvas, FloatRectangle& cursorBounds, bool isCursorOpaque)
 {
        result r = E_SUCCESS;
@@ -9302,45 +9030,6 @@ _EditPresenter::CalculateFlexibleHeightF(void)
        return height;
 }
 
-int
-_EditPresenter::CalculateFlexibleHeight(void)
-{
-       int height = 0;
-       int expectedEditHeight = __pTextObject->GetTotalHeight() + _CoordinateSystemUtils::ConvertToInteger(__verticalMargin);
-       int lineCount = __pTextObject->GetTotalLineCount();
-
-       if (__pTextObject->GetTotalHeight())
-       {
-               if ((lineCount >= MAX_LINE_NUMBER) && (GetMaxLineCount() > MAX_LINE_NUMBER))
-               {
-                       height = MAX_LINE_NUMBER * __pTextObject->GetLineHeightAt(0) + _CoordinateSystemUtils::ConvertToInteger(__verticalMargin);
-                       return height;
-               }
-
-               int maxHeight = _CoordinateSystemUtils::ConvertToInteger(CalculateMaximumFlexibleHeight());
-
-               //If InitialBounds is more than expectedEdit height, set flexible height as initial height
-               if (expectedEditHeight < _CoordinateSystemUtils::ConvertToInteger(__initialBounds.height))
-               {
-                       height = _CoordinateSystemUtils::ConvertToInteger(__initialBounds.height);
-               }
-               else if (expectedEditHeight >= maxHeight)
-               {
-                       height = maxHeight;
-               }
-               else
-               {
-                       height = expectedEditHeight;
-               }
-       }
-       else
-       {
-               height = _CoordinateSystemUtils::ConvertToInteger(__initialBounds.height);
-       }
-
-       return height;
-}
-
 result
 _EditPresenter::AdjustFlexibleHeight(void)
 {
@@ -9361,7 +9050,7 @@ _EditPresenter::AdjustFlexibleHeight(void)
 
        // get edit height
        FloatRectangle bounds = __pEdit->GetBoundsF();
-       float calculateHeight = CalculateFlexibleHeight();
+       float calculateHeight = CalculateFlexibleHeightF();
 
        if (bounds.height != calculateHeight)
        {
@@ -9376,47 +9065,6 @@ _EditPresenter::AdjustFlexibleHeight(void)
 }
 
 result
-_EditPresenter::SetFlexBounds(const Rectangle& bounds)
-{
-       result r = E_SUCCESS;
-
-       _ExpandableEditAreaEventStatus expandableEditAreaStatus = _EXPANDABLE_EDITAREA_EVENT_ADDED;
-       if (__pEdit->GetBounds().height > bounds.height)
-       {
-               expandableEditAreaStatus = _EXPANDABLE_EDITAREA_EVENT_REMOVED;
-       }
-       else if (__pEdit->GetBounds().height < bounds.height)
-       {
-               expandableEditAreaStatus = _EXPANDABLE_EDITAREA_EVENT_ADDED;
-       }
-
-       _VisualElement* pVisualElement = __pEdit->GetVisualElement();
-       SysTryReturnResult(NID_UI_CTRL, pVisualElement, E_SYSTEM, "A system error has occurred. Unable to get root visual element.");
-
-       pVisualElement->SetAnimationProvider(__pEditVEDelegator);
-       pVisualElement->SetImplicitAnimationEnabled(true);
-
-       if (!((__pEdit->GetEditStyle() & EDIT_STYLE_FLEXIBLE) == false))
-       {
-               __updateInitialBounds = false;
-       }
-
-       __pEdit->SetBounds(bounds);
-       __updateInitialBounds = true;
-
-       Resize();
-
-       __pEdit->Invalidate();
-
-       __prevTotalTextHeight = _CoordinateSystemUtils::ConvertToFloat(__pTextObject->GetTotalHeight());
-       __pEdit->SendExpandableEditAreaEvent(expandableEditAreaStatus);
-
-       pVisualElement->SetImplicitAnimationEnabled(false);
-
-       return r;
-}
-
-result
 _EditPresenter::SetFlexBounds(const FloatRectangle& bounds)
 {
        result r = E_SUCCESS;
@@ -9479,16 +9127,6 @@ _EditPresenter::CalculateMaximumFlexibleHeight(void)
 }
 
 bool
-_EditPresenter::SetKeypadBounds(const Rectangle& bounds)
-{
-       __keypadBounds.x = _CoordinateSystemUtils::ConvertToFloat(bounds.x);
-       __keypadBounds.y = _CoordinateSystemUtils::ConvertToFloat(bounds.y);
-       __keypadBounds.width = _CoordinateSystemUtils::ConvertToFloat(bounds.width);
-       __keypadBounds.height = _CoordinateSystemUtils::ConvertToFloat(bounds.height);
-       return true;
-}
-
-bool
 _EditPresenter::SetKeypadBounds(const FloatRectangle& bounds)
 {
        __keypadBounds.x = bounds.x;
@@ -9974,38 +9612,18 @@ _EditPresenter::SetScrollBarBounds(const FloatRectangle& bounds)
        return;
 }
 
-void
-_EditPresenter::SetScrollBarBounds(const Rectangle& bounds)
-{
-       __scrollBarBounds = _CoordinateSystemUtils::ConvertToFloat(bounds);
-
-       return;
-}
-
 FloatRectangle
 _EditPresenter::GetDisplayScrollBoundsF(void) const
 {
        return __scrollBarBounds;
 }
 
-Rectangle
-_EditPresenter::GetDisplayScrollBounds(void) const
-{
-       return _CoordinateSystemUtils::ConvertToInteger(__scrollBarBounds);
-}
-
 FloatRectangle
 _EditPresenter::GetInitialBoundsF(void) const
 {
        return __initialBounds;
 }
 
-Rectangle
-_EditPresenter::GetInitialBounds(void) const
-{
-       return _CoordinateSystemUtils::ConvertToInteger(__initialBounds);
-}
-
 void
 _EditPresenter::SetPreviousScrollBarPosition(int position)
 {
@@ -10360,36 +9978,18 @@ _EditPresenter::IsCopyPasteManagerExist(void) const
        return __isCopyPasteManagerExist;
 }
 
-Rectangle
-_EditPresenter::GetTextAreaBounds(void) const
-{
-       return _CoordinateSystemUtils::ConvertToInteger(__textObjectBounds);
-}
-
 FloatRectangle
 _EditPresenter::GetTextAreaBoundsF(void) const
 {
        return __textObjectBounds;
 }
 
-Rectangle
-_EditPresenter::GetTitleBounds(void) const
-{
-       return _CoordinateSystemUtils::ConvertToInteger(__titleBounds);
-}
-
 FloatRectangle
 _EditPresenter::GetTitleBoundsF(void) const
 {
        return __titleBounds;
 }
 
-Rectangle
-_EditPresenter::GetClearIconBounds(void) const
-{
-       return _CoordinateSystemUtils::ConvertToInteger(__clearIconBounds);
-}
-
 FloatRectangle
 _EditPresenter::GetClearIconBoundsF(void) const
 {

diff --git a/src/ui/inc/FUiCtrl_Edit.h b/src/ui/inc/FUiCtrl_Edit.h
index 9b2729b..178b783 100644 (file)
--- a/src/ui/inc/FUiCtrl_Edit.h
+++ b/src/ui/inc/FUiCtrl_Edit.h
@@ -347,9 +347,7 @@ public:
        result GetCurrentLanguage(Tizen::Locales::LanguageCode& language) const;
        void GetCurrentTextRange(int& start, int& end) const;
        int GetCursorPosition(void) const;
-       int GetCursorPositionAt(const Tizen::Graphics::Point& point) const;
        int GetCursorPositionAt(const Tizen::Graphics::FloatPoint& point) const;
-       result GetCursorBounds(bool isAbsRect, Tizen::Graphics::Rectangle& cursorBounds) const;
        result GetCursorBounds(bool isAbsRect, Tizen::Graphics::FloatRectangle& cursorBounds) const;
        void GetCutlinkColorInfo(EditCutLinkType type, EditCutlinkColor* colorInfo) const;
        EllipsisPosition GetEllipsisPosition(void) const;
@@ -362,7 +360,6 @@ public:
        InputStyle GetInputStyle(void) const;
        CoreKeypadAction GetKeypadAction(void) const;
        bool GetKeypadActionEnabled(void) const;
-       result GetKeypadBounds(Tizen::Graphics::Rectangle& rect) const;
        result GetKeypadBounds(Tizen::Graphics::FloatRectangle& rect) const;
        float GetClipboardHeight(void) const;
        KeypadStyle GetKeypadStyle(void) const;
@@ -395,7 +392,6 @@ public:
        result AppendCharacter(const Tizen::Base::Character& character);
        result AppendText(const Tizen::Base::String& text);
        result BeginTextBlock(void);
-       bool CalculateAbsoluteCursorBounds(int index, Tizen::Graphics::Rectangle& absCursorRect);
        bool CalculateAbsoluteCursorBounds(int index, Tizen::Graphics::FloatRectangle& absCursorRect);
        result ClearText(void);
        result CopyText(void);

diff --git a/src/ui/inc/FUiCtrl_EditCopyPasteManager.h b/src/ui/inc/FUiCtrl_EditCopyPasteManager.h
index 7668a6b..3ee3bf0 100644 (file)
--- a/src/ui/inc/FUiCtrl_EditCopyPasteManager.h
+++ b/src/ui/inc/FUiCtrl_EditCopyPasteManager.h
@@ -89,9 +89,7 @@ public:
        bool CheckHandleBounds(const Tizen::Graphics::FloatPoint& point);
        bool CheckHandlePosition(bool leftHandle, int cursorPosition);
        void RefreshBlock(bool isLeftHandle = false);
-       Tizen::Graphics::Rectangle GetCursorBounds(bool isAbsRect) const;
        Tizen::Graphics::FloatRectangle GetCursorBoundsF(bool isAbsRect) const;
-       int GetCursorPositionAt(const Tizen::Graphics::Point& touchPoint) const;
        int GetCursorPositionAt(const Tizen::Graphics::FloatPoint& touchPoint) const;
        result SetCursorPosition(int position);
        int GetCursorPosition(void) const;

diff --git a/src/ui/inc/FUiCtrl_EditPresenter.h b/src/ui/inc/FUiCtrl_EditPresenter.h
index d19d7d8..7dfd844 100644 (file)
--- a/src/ui/inc/FUiCtrl_EditPresenter.h
+++ b/src/ui/inc/FUiCtrl_EditPresenter.h
@@ -139,7 +139,6 @@ public:
        virtual void OnClipboardPopupClosed(const ClipboardItem* pClipboardItem);
        virtual result SetInitialBounds(void);
        virtual result Draw(Tizen::Graphics::Canvas& canvas);
-       virtual result DrawCursor(Tizen::Graphics::Canvas& canvas, Tizen::Graphics::Rectangle& cursorRect, bool isCursorOpaque);
        virtual result DrawCursor(Tizen::Graphics::Canvas& canvas, Tizen::Graphics::FloatRectangle& cursorRect, bool isCursorOpaque);
        virtual result DrawScrollBar(void);
        virtual bool OnFocusGained(void);
@@ -171,7 +170,6 @@ public:
        result SetCursorPosition(int position,int rowIndex, int columnIndex);
        void SetClientBounds(void);
        result SetEllipsisPosition(EllipsisPosition position);
-       virtual result SetFlexBounds(const Tizen::Graphics::Rectangle& bounds);
        virtual result SetFlexBounds(const Tizen::Graphics::FloatRectangle& bounds);
        virtual result SetTextSize(const int size);
        virtual result SetTextSize(const float size);
@@ -194,7 +192,6 @@ public:
        result SetKeypadCommandButton(CommandButtonPosition position, const Tizen::Base::String& text, int actionId);
        _Toolbar* GetKeypadCommandButton(void) const;
        result SetKeypadCommandButtonVisible(bool visible);
-       bool SetKeypadBounds(const Tizen::Graphics::Rectangle& bounds);
        bool SetKeypadBounds(const Tizen::Graphics::FloatRectangle& bounds);
        result SetText(const Tizen::Base::String& text);
        result SetTextAlignment(HorizontalAlignment alignment);
@@ -207,12 +204,10 @@ public:
        EditInputModeCategory GetCurrentInputModeCategory(void) const;
        result GetCurrentLanguage(Tizen::Locales::LanguageCode& language) const;
        void GetCurrentTextRange(int& start, int& end) const;
-       int GetCursorPositionAt(const Tizen::Graphics::Point& touchPoint) const;
        int GetCursorPositionAt(const Tizen::Graphics::FloatPoint& touchPoint) const;
        int GetCursorPositionAt(const Tizen::Graphics::FloatPoint& touchPoint, int& rowIndex, int& columnIndex, bool isMoving = false);
        virtual bool IsTextBlockedInTokenEdit(void) const;
        int GetCursorPosition(void) const;
-       result GetCursorBounds(bool isAbsRect, Tizen::Graphics::Rectangle& cursorBounds);
        result GetCursorBounds(bool isAbsRect, Tizen::Graphics::FloatRectangle& cursorBounds);
        EllipsisPosition GetEllipsisPosition(void) const;
        Tizen::Graphics::Font* GetFont(void) const;
@@ -229,7 +224,6 @@ public:
        float GetTextSizeF(void) const;
        unsigned long GetInputModeCategory(void) const;
        CoreKeypadAction GetKeypadAction(void) const;
-       result GetKeypadBounds(Tizen::Graphics::Rectangle& bounds) const;
        result GetKeypadBounds(Tizen::Graphics::FloatRectangle& bounds) const;
        float GetClipboardHeight(void) const;
        bool CheckKeypadExist(_ControlOrientation orientation);
@@ -270,7 +264,6 @@ public:
        result AppendCharacter(const Tizen::Base::Character& character);
        result AppendText(const Tizen::Base::String& text);
        result BeginTextBlock(void);
-       result CalculateAbsoluteCursorBounds(int index, Tizen::Graphics::Rectangle& absCursorBounds);
        result CalculateAbsoluteCursorBounds(int index, Tizen::Graphics::FloatRectangle& absCursorBounds);
        result CalculateAbsoluteCursorBounds(int rowIndex, int columnIndex, FloatRectangle& absCursorBounds);
        virtual result ChangeLayout(_ControlOrientation orientation);
@@ -293,11 +286,8 @@ public:
        result Resize(void);
        result ShowKeypad(bool focus = true);
        result StartFlickAnimation(const Tizen::Graphics::FloatPoint& flickPosition, int flickTime);
-       Tizen::Graphics::Rectangle GetTextAreaBounds(void) const;
        Tizen::Graphics::FloatRectangle GetTextAreaBoundsF(void) const;
-       Tizen::Graphics::Rectangle GetTitleBounds(void) const;
        Tizen::Graphics::FloatRectangle GetTitleBoundsF(void) const;
-       Tizen::Graphics::Rectangle GetClearIconBounds(void) const;
        Tizen::Graphics::FloatRectangle GetClearIconBoundsF(void) const;
        void FinishTextComposition(void);
        void InitializeCopyPasteManager(void);
@@ -338,7 +328,6 @@ public:
        virtual Tizen::Graphics::Rectangle GetTextBounds(void) const;
        virtual Tizen::Graphics::FloatRectangle GetTextBoundsF(void) const;
        result InitializeCursor(void);
-       result CalculateCursorBounds(const Tizen::Graphics::Rectangle& textBounds, Tizen::Graphics::Rectangle& cursorBounds, int curPos = -1);
        result CalculateCursorBounds(const Tizen::Graphics::FloatRectangle& textBounds, Tizen::Graphics::FloatRectangle& cursorBounds, int curPos = -1);
        result CalculateCursorBounds(const Tizen::Graphics::FloatRectangle& textBounds, Tizen::Graphics::FloatRectangle& cursorBounds, int rowIndex, int columnIndex);
        virtual void ResetTextBounds(void){}
@@ -360,16 +349,12 @@ protected:
        result StartCursorTimer(void);
        virtual void OnCursorTimerExpired(void);
        virtual result SetModel(const _EditModel& editModel);
-       virtual int CalculateFlexibleHeight(void);
        virtual float CalculateFlexibleHeightF(void);
        void SetCursorEnabled(bool enable);
        bool IsCursorEnabled(void) const;
        void SetScrollBarVisible(bool enable);
-       void SetScrollBarBounds(const Tizen::Graphics::Rectangle& bounds);
        void SetScrollBarBounds(const Tizen::Graphics::FloatRectangle& bounds);
-       Tizen::Graphics::Rectangle GetDisplayScrollBounds(void) const;
        Tizen::Graphics::FloatRectangle GetDisplayScrollBoundsF(void) const;
-       Tizen::Graphics::Rectangle GetInitialBounds(void) const;
        Tizen::Graphics::FloatRectangle GetInitialBoundsF(void) const;
        void SetPreviousScrollBarPosition(int position);
        void SetPreviousScrollBarPosition(float position);