From 279c4bab3174aa1373d7a3e255beeed327988a81 Mon Sep 17 00:00:00 2001 From: Dmitry Batrak Date: Mon, 21 Mar 2016 16:18:56 +0300 Subject: [PATCH] ScrollingModelImpl refactoring --- .../openapi/editor/impl/ScrollingModelImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/ScrollingModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/ScrollingModelImpl.java index e0de68cfdb2c..e487c7c303c1 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/ScrollingModelImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/ScrollingModelImpl.java @@ -148,9 +148,13 @@ public class ScrollingModelImpl implements ScrollingModelEx { } private void scrollTo(@NotNull VisualPosition pos, @NotNull ScrollType scrollType) { + Point targetLocation = myEditor.visualPositionToXY(pos); + scrollTo(targetLocation, scrollType); + } + + private void scrollTo(@NotNull Point targetLocation, @NotNull ScrollType scrollType) { AnimatedScrollingRunnable canceledThread = cancelAnimatedScrolling(false); Rectangle viewRect = canceledThread != null ? canceledThread.getTargetVisibleArea() : getVisibleArea(); - Point targetLocation = myEditor.visualPositionToXY(pos); Point p = calcOffsetsToScroll(targetLocation, scrollType, viewRect); scrollToOffsets(p.x, p.y); } @@ -159,11 +163,8 @@ public class ScrollingModelImpl implements ScrollingModelEx { public void scrollTo(@NotNull LogicalPosition pos, @NotNull ScrollType scrollType) { assertIsDispatchThread(); - AnimatedScrollingRunnable canceledThread = cancelAnimatedScrolling(false); - Rectangle viewRect = canceledThread != null ? canceledThread.getTargetVisibleArea() : getVisibleArea(); Point targetLocation = myEditor.logicalPositionToXY(pos); - Point p = calcOffsetsToScroll(targetLocation, scrollType, viewRect); - scrollToOffsets(p.x, p.y); + scrollTo(targetLocation, scrollType); } private static void assertIsDispatchThread() {