opendev/gerrit
Code Issues Proposed changes

SideBySide2: Focus on A for deleted files

Browse Source 
When a file is deleted the B side does not exist.
Focus on the A side instead.

Change-Id: I14a72e3ca4e483ec1aff68d402d4dd86b0496497
This commit is contained in:
Shawn Pearce
2013-12-11 00:11:13 -08:00
parent d1451ead6b
commit b379ab078e
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -260,17 +260,22 @@ public class SideBySide2 extends Screen {
}); });
diffTable.sidePanel.adjustGutters(cmB); diffTable.sidePanel.adjustGutters(cmB);
int line = 0; if (diff.meta_b() != null) {
if (!diffChunks.isEmpty()) { int line = 0;
DiffChunkInfo d = diffChunks.get(0); if (!diffChunks.isEmpty()) {
CodeMirror cm = getCmFromSide(d.getSide()); DiffChunkInfo d = diffChunks.get(0);
line = d.getStart(); CodeMirror cm = getCmFromSide(d.getSide());
if (cm.lineAtHeight(height - 20) < line) { line = d.getStart();
cm.scrollToY(cm.heightAtLine(line, "local") - 0.5 * height); if (cm.lineAtHeight(height - 20) < line) {
cm.scrollToY(cm.heightAtLine(line, "local") - 0.5 * height);
}
} }
cmB.setCursor(LineCharacter.create(line));
cmB.focus();
} else {
cmA.setCursor(LineCharacter.create(0));
cmA.focus();
} }
cmB.setCursor(LineCharacter.create(line));
cmB.focus();
prefetchNextFile(); prefetchNextFile();
} }