mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-19 15:05:36 +02:00
Code Issues Wiki Activity

Bug 196465 - [terminal] Resizing Terminal changes Scroller location

Browse source
This commit is contained in:
Martin Oberhuber 2011-01-21 00:27:53 +00:00
parent 45c9e38b20
commit 909781e733
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2007, 2010 Wind River Systems, Inc. and others. * Copyright (c) 2007, 2011 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -13,6 +13,7 @@
* Anton Leherbauer (Wind River) - [294468] Fix scroller and text line rendering * Anton Leherbauer (Wind River) - [294468] Fix scroller and text line rendering
* Uwe Stieber (Wind River) - [205486] Fix ScrollLock always moving to line 1 * Uwe Stieber (Wind River) - [205486] Fix ScrollLock always moving to line 1
* Anton Leherbauer (Wind River) - [219589] Copy an entire line selection * Anton Leherbauer (Wind River) - [219589] Copy an entire line selection
* Anton Leherbauer (Wind River) - [196465] Resizing Terminal changes Scroller location
*******************************************************************************/ *******************************************************************************/
package org.eclipse.tm.internal.terminal.textcanvas; package org.eclipse.tm.internal.terminal.textcanvas;
@ -73,6 +74,8 @@ public class TextCanvas extends GridCanvas {
private int fMinColumns=80; private int fMinColumns=80;
private int fMinLines=4; private int fMinLines=4;
private boolean fCursorEnabled; private boolean fCursorEnabled;
private boolean fResizing;
/** /**
* Create a new CellCanvas with the given SWT style bits. * Create a new CellCanvas with the given SWT style bits.
* (SWT.H_SCROLL and SWT.V_SCROLL are automatically added). * (SWT.H_SCROLL and SWT.V_SCROLL are automatically added).
@ -94,7 +97,8 @@ public class TextCanvas extends GridCanvas {
if(isDisposed()) if(isDisposed())
return; return;
// scroll to end (unless scroll lock is active) // scroll to end (unless scroll lock is active)
scrollToEnd(); if (!fResizing)
scrollToEnd();
} }
}); });
// let the cursor blink if the text canvas gets the focus... // let the cursor blink if the text canvas gets the focus...
@ -243,15 +247,23 @@ public class TextCanvas extends GridCanvas {
} }
protected void onResize() { protected void onResize() {
onResize(false); fResizing = true;
try {
onResize(false);
} finally {
fResizing = false;
}
} }
private void calculateGrid() { private void calculateGrid() {
Rectangle virtualBounds = getVirtualBounds();
setVirtualExtend(getCols()*getCellWidth(),getRows()*getCellHeight()); setVirtualExtend(getCols()*getCellWidth(),getRows()*getCellHeight());
setRedraw(false); setRedraw(false);
try { try {
// scroll to end (unless scroll lock is active) // scroll to end if view port was near last line
scrollToEnd(); Rectangle viewRect = getViewRectangle();
if (virtualBounds.height - (viewRect.y + viewRect.height) < getCellHeight() * 2)
scrollToEnd();
getParent().layout(); getParent().layout();
} finally { } finally {
setRedraw(true); setRedraw(true);