Revert "fix for N_SE-46737 in ScrollPanel Signed-off-by: moinuddin.s <moinuddin.s...

And submitting actual fix.

This reverts commit 7d6d1b50412866017ce81b1e1316b9c1c65751e0

Change-Id: I0364abdf8a19cfae7829d399b4a9cb672128ea2e
Signed-off-by: moinuddin.s <moinuddin.s@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp b/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp
index f882050..501793d 100644 (file)
--- a/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp
@@ -497,7 +497,7 @@ _ScrollPanelPresenter::RunTouchReleased(const _Control& source, const _TouchInfo
                float currentPosition = GetScrollPosition();
                float targetPosition = CalculatePagingScrollPosition(currentPosition);
 
-               if (!_FloatCompare(targetPosition, currentPosition))
+               if (targetPosition > currentPosition || targetPosition < currentPosition)
                {
                        SetScrollPosition(targetPosition, true);
                        result r = GetLastResult();
@@ -674,7 +674,7 @@ _ScrollPanelPresenter::OnTouchMoved(const _Control& source, const _TouchInfo& to
        {
                if (scrollDirection == SCROLL_PANEL_SCROLL_DIRECTION_HORIZONTAL)
                {
-                       if (_FloatCompareLE(_Abs(scrollDistanceY), _Abs(scrollDistanceX)))
+                       if (_Abs(scrollDistanceY) <= _Abs(scrollDistanceX))
                        {
                                scrollDistance = scrollDistanceX;
                        }
@@ -685,7 +685,7 @@ _ScrollPanelPresenter::OnTouchMoved(const _Control& source, const _TouchInfo& to
                }
                else if (scrollDirection == SCROLL_PANEL_SCROLL_DIRECTION_VERTICAL)
                {
-                       if (_FloatCompareGE(_Abs(scrollDistanceY), _Abs(scrollDistanceX)))
+                       if (_Abs(scrollDistanceY) >= _Abs(scrollDistanceX))
                        {
                                scrollDistance = scrollDistanceY;
                        }
@@ -974,7 +974,7 @@ _ScrollPanelPresenter::DoFlickGestureRecognized(_TouchFlickGestureDetector& gest
                        float pageGap = (scrollPosition + moveAmount) - targetPageMin;
                        float targetPageMax = targetPageMin + pageSize;
 
-                       if (_FloatCompareLE(pageGap, (targetPageMax - targetPageMin - pageGap)))
+                       if (pageGap <= targetPageMax - targetPageMin - pageGap)
                        {
                                moveAmount = targetPageMin - scrollPosition;
                        }
@@ -1115,7 +1115,7 @@ _ScrollPanelPresenter::CalculatePagingScrollPosition(float position) const
                currentPageMax = maxPosition;
        }
 
-       if (_FloatCompareLE(pageGap, (currentPageMax - currentPageMin - pageGap)))
+       if (pageGap <= currentPageMax - currentPageMin - pageGap)
        {
                targetPosition = currentPageMin;
        }
@@ -1634,7 +1634,7 @@ _ScrollPanelPresenter::ScrollToInternal(float targetPosition)
                                float minScrollPos = scrollArea.x;
                                float maxScrollPos = scrollArea.width - scrollPanelBounds.width;
 
-                               if ((_FloatCompareGE(targetPosition, minScrollPos) && _FloatCompareLE(targetPosition, maxScrollPos))
+                               if ((targetPosition >= minScrollPos && targetPosition <= maxScrollPos)
                                        || (previousScrollPosition > minScrollPos || previousScrollPosition < maxScrollPos))
                                {
                                        __pScrollPanel->FireOnScrollPositionChangedEvent();
@@ -1642,11 +1642,11 @@ _ScrollPanelPresenter::ScrollToInternal(float targetPosition)
 
                                if (previousScrollPosition > minScrollPos && previousScrollPosition < maxScrollPos)
                                {
-                                       if (_FloatCompareLE(targetPosition, minScrollPos))
+                                       if (targetPosition <= minScrollPos)
                                        {
                                                __pScrollPanel->FireOnScrollEndEvent(SCROLL_END_EVENT_END_LEFT);
                                        }
-                                       else if (_FloatCompareGE(targetPosition, maxScrollPos))
+                                       else if (targetPosition >= maxScrollPos)
                                        {
                                                __pScrollPanel->FireOnScrollEndEvent(SCROLL_END_EVENT_END_RIGHT);
                                        }
@@ -1660,7 +1660,7 @@ _ScrollPanelPresenter::ScrollToInternal(float targetPosition)
                                float minScrollPos = scrollArea.y;
                                float maxScrollPos = scrollArea.height - scrollPanelBounds.height;
 
-                               if ((_FloatCompareGE(targetPosition, minScrollPos) && _FloatCompareLE(targetPosition, maxScrollPos))
+                               if ((targetPosition >= minScrollPos && targetPosition <= maxScrollPos)
                                        || (previousScrollPosition > minScrollPos || previousScrollPosition < maxScrollPos))
                                {
                                        __pScrollPanel->FireOnScrollPositionChangedEvent();
@@ -1668,11 +1668,11 @@ _ScrollPanelPresenter::ScrollToInternal(float targetPosition)
 
                                if (previousScrollPosition > minScrollPos && previousScrollPosition < maxScrollPos)
                                {
-                                       if (_FloatCompareLE(targetPosition, minScrollPos))
+                                       if (targetPosition <= minScrollPos)
                                        {
                                                __pScrollPanel->FireOnScrollEndEvent(SCROLL_END_EVENT_END_TOP);
                                        }
-                                       else if (_FloatCompareGE(targetPosition, maxScrollPos))
+                                       else if (targetPosition >= maxScrollPos)
                                        {
                                                __pScrollPanel->FireOnScrollEndEvent(SCROLL_END_EVENT_END_BOTTOM);
                                        }
@@ -1725,7 +1725,7 @@ _ScrollPanelPresenter::ChangeScrollBarRange(void)
                        scrollRange = GetScrollAreaBounds().height;
                }
 
-               if (_FloatCompareLE(viewRange, scrollRange))
+               if (viewRange <= scrollRange)
                {
                        result r = pScrollBar->SetScrollRange(viewRange, scrollRange);
                        SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
@@ -1946,12 +1946,12 @@ _ScrollPanelPresenter::SetScrollAreaBounds(FloatRectangle& bounds)
 
        if (__pScrollPanel->GetScrollDirection() == SCROLL_PANEL_SCROLL_DIRECTION_HORIZONTAL)
        {
-               SysTryReturn(NID_UI_CTRL, _FloatCompareLE(__pScrollPanel->GetBoundsF().width, bounds.width), E_INVALID_ARG, E_INVALID_ARG, "[%s] width is less than the width of ScrollPanel", GetErrorMessage(E_INVALID_ARG));
+               SysTryReturn(NID_UI_CTRL, __pScrollPanel->GetBoundsF().width <= bounds.width, E_INVALID_ARG, E_INVALID_ARG, "[%s] width is less than the width of ScrollPanel", GetErrorMessage(E_INVALID_ARG));
                bounds.height = __pScrollPanel->GetBoundsF().height;
        }
        else
        {
-               SysTryReturn(NID_UI_CTRL, _FloatCompareLE(__pScrollPanel->GetBoundsF().height, bounds.height), E_INVALID_ARG, E_INVALID_ARG, "[%s] height is less than the height of ScrollPanel", GetErrorMessage(E_INVALID_ARG));
+               SysTryReturn(NID_UI_CTRL, __pScrollPanel->GetBoundsF().height <= bounds.height, E_INVALID_ARG, E_INVALID_ARG, "[%s] height is less than the height of ScrollPanel", GetErrorMessage(E_INVALID_ARG));
                bounds.width = __pScrollPanel->GetBoundsF().width;
        }