From 5ac80fd93799ac8a95dd90bbf972ce07b699804f Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Tue, 19 May 2015 08:09:21 +0200 Subject: [PATCH] Position cursor on first column on diff chunk navigation Navigation by clicking on the scroll bar still positions the cursor on the last column. Only initial position and navigation per keys 'p' and 'n' is changed. Change-Id: I968171ed1293d722c07f816e3c4a154d23cdac7a --- .../main/java/com/google/gerrit/client/diff/ChunkManager.java | 2 +- gerrit-gwtui/src/main/java/net/codemirror/lib/CodeMirror.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/ChunkManager.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/ChunkManager.java index 4420940b17..fed8f9186c 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/ChunkManager.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/ChunkManager.java @@ -317,7 +317,7 @@ class ChunkManager { DiffChunkInfo target = chunks.get(res); CodeMirror targetCm = host.getCmFromSide(target.getSide()); - targetCm.setCursor(Pos.create(target.getStart())); + targetCm.setCursor(Pos.create(target.getStart(), 0)); targetCm.focus(); targetCm.scrollToY( targetCm.heightAtLine(target.getStart(), "local") - diff --git a/gerrit-gwtui/src/main/java/net/codemirror/lib/CodeMirror.java b/gerrit-gwtui/src/main/java/net/codemirror/lib/CodeMirror.java index fc215324e7..1c9ad3c72f 100644 --- a/gerrit-gwtui/src/main/java/net/codemirror/lib/CodeMirror.java +++ b/gerrit-gwtui/src/main/java/net/codemirror/lib/CodeMirror.java @@ -204,7 +204,7 @@ public class CodeMirror extends JavaScriptObject { if (lineAtHeight(height - 20) < line) { scrollToY(heightAtLine(line, "local") - 0.5 * height); } - setCursor(Pos.create(line)); + setCursor(Pos.create(line, 0)); } public final native ScrollInfo getScrollInfo() /*-{