Attachment 196087 Details for Bug 324608 – Proposed patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Proposed patch

324608.patch (text/plain), 2.16 KB, created by Anton Leherbauer

on 2011-05-19 04:54:54 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Anton Leherbauer

Created: 2011-05-19 04:54:54 EDT

Size: 2.16 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tm.terminal
>Index: src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java,v
>retrieving revision 1.21.2.1
>diff -u -r1.21.2.1 TextCanvas.java
>--- src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java	26 Jan 2011 02:32:19 -0000	1.21.2.1
>+++ src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java	18 May 2011 13:26:58 -0000
>@@ -14,6 +14,7 @@
>  * 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) - [196465] Resizing Terminal changes Scroller location
>+ * Anton Leherbauer (Wind River) - [324608] Terminal has strange scrolling behaviour
>  *******************************************************************************/
> package org.eclipse.tm.internal.terminal.textcanvas;
> 
>@@ -97,8 +98,10 @@
> 				if(isDisposed())
> 					return;
> 				// scroll to end (unless scroll lock is active)
>-				if (!fResizing)
>+				if (!fResizing) {
>+					calculateGrid();
> 					scrollToEnd();
>+				}
> 			}
> 		});
> 		// let the cursor blink if the text canvas gets the focus...
>@@ -257,14 +260,16 @@
> 
> 	private void calculateGrid() {
> 		Rectangle virtualBounds = getVirtualBounds();
>-		setVirtualExtend(getCols()*getCellWidth(),getRows()*getCellHeight());
> 		setRedraw(false);
> 		try {
>-			// scroll to end if view port was near last line
>-			Rectangle viewRect = getViewRectangle();
>-			if (virtualBounds.height - (viewRect.y + viewRect.height) < getCellHeight() * 2)
>-				scrollToEnd();
>+			setVirtualExtend(getCols()*getCellWidth(),getRows()*getCellHeight());
> 			getParent().layout();
>+			if (fResizing) {
>+				// scroll to end if view port was near last line
>+				Rectangle viewRect = getViewRectangle();
>+				if (virtualBounds.height - (viewRect.y + viewRect.height) < getCellHeight() * 2)
>+					scrollToEnd();
>+			}
> 		} finally {
> 			setRedraw(true);
> 		}

Flags:

mober.at+eclipse: iplog+

Actions: View | Diff

Attachments on bug 324608: 196087