fix scroll position conflict on ScrollPanel

- conflict has occurred when scroll area and scroll position changed at the same time

Change-Id: If5db2d7fd11ec9dcfbdc46e3602d008d29d08cec
Signed-off-by: Park Kyoung Hee <kh1979.park@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp b/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp
index 48170ff..e09159c 100644 (file)
--- a/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp
@@ -1381,7 +1381,9 @@ _ScrollPanelPresenter::AdjustModel()
        {
                float scrollPosition = GetScrollPositionInternal();
                float fixedScrollPosition = FixScrollPositionIntoScrollAreaBounds(scrollPosition);
-               if (!_FloatCompare(scrollPosition, fixedScrollPosition))
+               float previousFixedScrollPosition = FixScrollPositionIntoScrollAreaBounds(scrollPosition, __previousBounds, __previousScrollAreaBounds);
+               if (!_FloatCompare(scrollPosition, fixedScrollPosition)
+                       || !_FloatCompare(scrollPosition, previousFixedScrollPosition))
                {
                        ScrollTo(fixedScrollPosition, false);
                        result r = GetLastResult();