Bug 457969 - [console] Automatic scroll lock should unlock when user

enters characters

Change-Id: Ie48a335b09929351bd7b8b62434f92d6c23859a1

1 files changed, 12 insertions, 0 deletions

diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsoleViewer.java b/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsoleViewer.java
index 504f0ce0a..ca9581d3c 100644
--- a/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsoleViewer.java
+++ b/org.eclipse.ui.console/src/org/eclipse/ui/console/TextConsoleViewer.java
@@ -31,6 +31,8 @@ import org.eclipse.swt.events.MouseTrackListener;
 import org.eclipse.swt.events.MouseWheelListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.VerifyEvent;
+import org.eclipse.swt.events.VerifyListener;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Cursor;
 import org.eclipse.swt.graphics.Font;
@@ -278,6 +280,16 @@ public class TextConsoleViewer extends SourceViewer implements LineStyleListener
 			}
 		});
 
+		styledText.addVerifyListener(new VerifyListener() {
+			@Override
+			public void verifyText(VerifyEvent e) {
+				// unlock the auto lock if user starts typing only if it was not manual lock
+				if (scrollLockStateProvider != null && !scrollLockStateProvider.getScrollLock()) {
+					setScrollLock(false);
+				}
+			}
+		});
+
         ColorRegistry colorRegistry = JFaceResources.getColorRegistry();
         propertyChangeListener = new HyperlinkColorChangeListener();
         colorRegistry.addListener(propertyChangeListener);