MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

diff: do not scroll to change, if visible position was changed during loading

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-03-03 19:26:42 +03:00
parent 964cf5c02d
commit 56ba3ff8f9
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/tools/util/threeside/ThreesideTextDiffViewer.java
+1
View File
@@ -463,6 +463,7 @@ public abstract class ThreesideTextDiffViewer extends TextDiffViewerBase {
}
public void onRediff() {
if (DiffUtil.wasScrolled(getEditors())) myShouldScroll = false;
if (myShouldScroll && myScrollToChange != null) {
myShouldScroll = !doScrollToChange(myScrollToChange);
}
platform/diff-impl/src/com/intellij/diff/tools/util/twoside/TwosideTextDiffViewer.java
+1
View File
@@ -495,6 +495,7 @@ public abstract class TwosideTextDiffViewer extends TextDiffViewerBase {
}
public void onRediff() {
if (DiffUtil.wasScrolled(getEditors())) myShouldScroll = false;
if (myShouldScroll && myScrollToChange != null) {
myShouldScroll = !doScrollToChange(myScrollToChange);
}
platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
+10
View File
@@ -249,6 +249,16 @@ public class DiffUtil {
return carets;
}
public static boolean wasScrolled(@NotNull List<? extends Editor> editors) {
for (Editor editor : editors) {
if (editor == null) continue;
if (editor.getCaretModel().getOffset() != 0) return true;
if (editor.getScrollingModel().getVerticalScrollOffset() != 0) return true;
if (editor.getScrollingModel().getHorizontalScrollOffset() != 0) return true;
}
return false;
}
public static class EditorsVisiblePositions {
public static final Key<EditorsVisiblePositions> KEY = Key.create("Diff.EditorsVisiblePositions");