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: fix scrolling on 'prev/next difference' action

Browse Source 
* fix typos
* scroll slave editor to final destination even if master editor haven't scrolled to the end
this could happen if we made a mistake in getTargetOffsets() and master editor wasn't scrolled till the target position (because editor can't be scrolled to the required position)
This commit is contained in:
Aleksey Pivovarov
2015-05-25 19:10:30 +03:00
parent e9cb730532
commit e1494d090e
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/tools/util/SyncScrollSupport.java
+6 -4
View File
@@ -124,10 +124,12 @@ public class SyncScrollSupport {
myHelper1.removeAnchor();
myHelper2.removeAnchor();
if (masterOffset == masterStartOffset) { // master editor didn't scrolled
int masterFinalOffset = masterEditor.getScrollingModel().getVisibleArea().y;
int slaveFinalOffset = slaveEditor.getScrollingModel().getVisibleArea().y;
if (slaveFinalOffset != slaveOffset) {
myDuringSyncScroll = true;
doScrollVertically(slaveEditor, slaveOffset, animate);
doScrollVertically(slaveEditor, slaveOffset, animate && masterFinalOffset == masterStartOffset);
slaveEditor.getScrollingModel().runActionOnScrollingFinished(new Runnable() {
@Override
@@ -318,7 +320,7 @@ public class SyncScrollSupport {
int editorHeight2 = editor2.getScrollingModel().getVisibleArea().height;
int maximumOffset1 = ((EditorEx)editor1).getScrollPane().getVerticalScrollBar().getMaximum() - editorHeight1;
int maximumOffset2 = ((EditorEx)editor1).getScrollPane().getVerticalScrollBar().getMaximum() - editorHeight2;
int maximumOffset2 = ((EditorEx)editor2).getScrollPane().getVerticalScrollBar().getMaximum() - editorHeight2;
// 'shift' here - distance between editor's top and first line of range
@@ -340,7 +342,7 @@ public class SyncScrollSupport {
if (maximumOffset1 > offset1 && maximumOffset2 > offset2) return new IntPair(offset1, offset2);
// One of the ranges is at end of file - we can't scroll where we want to.
topShift = Math.min(topOffset1 - maximumOffset1, topOffset2 - maximumOffset2);
topShift = Math.max(topOffset1 - maximumOffset1, topOffset2 - maximumOffset2);
// Try to show as much of range as we can (even if it breaks alignment)
offset1 = topOffset1 - topShift + Math.max(topShift + rangeHeight1 + gapLines1 - editorHeight1, 0);