opendev/gerrit
Code Issues Proposed changes

Merge "Use Shift-Left and Shift-Right to flip side of focus"

Browse Source
This commit is contained in:
Shawn Pearce
2013-08-20 00:11:24 +00:00
committed by Gerrit Code Review
parent 37354063b6 f2a68082b7
commit ac3a0e53e9
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
View File

@@ -331,7 +331,9 @@ public class SideBySide2 extends Screen {
}
})
.on("Alt-N", diffChunkNav(cm, false))
.on("Alt-P", diffChunkNav(cm, true)));
.on("Alt-P", diffChunkNav(cm, true))
.on("Shift-Left", flipCursorSide(cm, true))
.on("Shift-Right", flipCursorSide(cm, false)));
}
@Override
@@ -1012,7 +1014,6 @@ public class SideBySide2 extends Screen {
if (!(cm.hasActiveLine() &&
cm.getLineNumber(cm.getActiveLine()) == line)) {
cm.setCursor(LineCharacter.create(line));
updateActiveLine(cm).run();
}
Scheduler.get().scheduleDeferred(new ScheduledCommand() {
@Override
@@ -1102,6 +1103,20 @@ public class SideBySide2 extends Screen {
};
}
private Runnable flipCursorSide(final CodeMirror cm, final boolean toLeft) {
return new Runnable() {
public void run() {
if (cm.hasActiveLine() && (toLeft && cm == cmB || !toLeft && cm == cmA)) {
CodeMirror other = otherCm(cm);
other.setCursor(LineCharacter.create(
mapper.lineOnOther(
getSideFromCm(cm), cm.getLineNumber(cm.getActiveLine())).getLine()));
other.focus();
}
}
};
}
private Runnable diffChunkNav(final CodeMirror cm, final boolean prev) {
return new Runnable() {
@Override