From f28a3e7e0fac97e24e039b3dc300bf98bf911c4e Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Mon, 18 May 2015 20:55:54 +0300 Subject: [PATCH] diff: try another initial scroll method on fail --- .../com/intellij/diff/tools/simple/SimpleDiffViewer.java | 9 +++------ .../diff/tools/simple/SimpleThreesideDiffViewer.java | 6 ++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java index 3e1a7786d1bf..b6f55de5ba64 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java @@ -1103,21 +1103,18 @@ public class SimpleDiffViewer extends TwosideTextDiffViewer { @Override protected boolean doScrollToChange() { if (myScrollToChange == null) return false; - SimpleDiffViewer.this.doScrollToChange(myScrollToChange); - return true; + return SimpleDiffViewer.this.doScrollToChange(myScrollToChange); } @Override protected boolean doScrollToFirstChange() { - SimpleDiffViewer.this.doScrollToChange(ScrollToPolicy.FIRST_CHANGE); - return true; + return SimpleDiffViewer.this.doScrollToChange(ScrollToPolicy.FIRST_CHANGE); } @Override protected boolean doScrollToContext() { if (myNavigationContext == null) return false; - SimpleDiffViewer.this.doScrollToContext(myNavigationContext); - return true; + return SimpleDiffViewer.this.doScrollToContext(myNavigationContext); } } } diff --git a/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffViewer.java index 342052fd48b5..5bb3ad3fb2b9 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffViewer.java @@ -672,14 +672,12 @@ public class SimpleThreesideDiffViewer extends ThreesideTextDiffViewer { @Override protected boolean doScrollToChange() { if (myScrollToChange == null) return false; - SimpleThreesideDiffViewer.this.doScrollToChange(myScrollToChange); - return true; + return SimpleThreesideDiffViewer.this.doScrollToChange(myScrollToChange); } @Override protected boolean doScrollToFirstChange() { - SimpleThreesideDiffViewer.this.doScrollToChange(ScrollToPolicy.FIRST_CHANGE); - return true; + return SimpleThreesideDiffViewer.this.doScrollToChange(ScrollToPolicy.FIRST_CHANGE); } } }