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

IDEA-64710 Tab switching loses scrolling position when virtual space is within the view area

Browse Source 
Remembering virtual page height in order to keep viewport position on editor tabs switch
This commit is contained in:
Denis Zhdanov
2011-02-01 17:06:00 +03:00
parent 212199de04
commit ba352e9fe7
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
+19 -1
View File
@@ -222,6 +222,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
private boolean myIsColumnMode = false;
private Color myForcedBackground = null;
private Dimension myPreferredSize;
private int myVirtualPageHeight;
private Runnable myGutterSizeUpdater = null;
private boolean myGutterNeedsUpdate = false;
private Alarm myAppleRepaintAlarm;
@@ -2903,7 +2904,24 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
if (isOneLineMode()) return new Dimension(size.width, getLineHeight());
if (mySettings.isAdditionalPageAtBottom()) {
int lineHeight = getLineHeight();
return new Dimension(size.width, size.height + Math.max(getScrollingModel().getVisibleArea().height - 2 * lineHeight, lineHeight));
int visibleAreaHeight = getScrollingModel().getVisibleArea().height;
int virtualPageHeight;
// There is a possible case that user with 'show additional page at bottom' scrolls to that virtual page; switched to another
// editor (another tab); and then returns to the previously used editor (the one scrolled to virtual page). We want to preserve
// correct view size then because viewport position is set to the end of the original text otherwise.
if (visibleAreaHeight <= 0 && myVirtualPageHeight > 0) {
virtualPageHeight = myVirtualPageHeight;
}
else {
myVirtualPageHeight = virtualPageHeight = Math.max(visibleAreaHeight - 2 * lineHeight, lineHeight);
}
if (myVirtualPageHeight > 0) {
return new Dimension(size.width, size.height + virtualPageHeight);
}
else {
return size;
}
}
return getContentSize();