opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.9' into stable-2.10

Browse Source 
* stable-2.9:
  SideBySide2: Correct placement of column margin bar

Change-Id: I48d58e0b4ff031091b7b06226346db5a545c9e15
This commit is contained in:
Shawn Pearce 2014-11-07 07:54:46 -08:00
commit e86e827175
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,7 @@ import com.google.gwt.core.client.Scheduler.RepeatingCommand;
import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.core.client.Scheduler.ScheduledCommand;
import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.Element;
import com.google.gwt.dom.client.NativeEvent; import com.google.gwt.dom.client.NativeEvent;
import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.dom.client.Style;
import com.google.gwt.event.dom.client.FocusEvent; import com.google.gwt.event.dom.client.FocusEvent;
import com.google.gwt.event.dom.client.FocusHandler; import com.google.gwt.event.dom.client.FocusHandler;
import com.google.gwt.event.dom.client.KeyCodes; import com.google.gwt.event.dom.client.KeyCodes;
@ -115,6 +115,7 @@ public class SideBySide2 extends Screen {
private CodeMirror cmB; private CodeMirror cmB;
private Element columnMarginA; private Element columnMarginA;
private Element columnMarginB; private Element columnMarginB;
private double charWidthPx;
private HandlerRegistration resizeHandler; private HandlerRegistration resizeHandler;
private ScrollSynchronizer scrollSynchronizer; private ScrollSynchronizer scrollSynchronizer;
private DiffInfo diff; private DiffInfo diff;
@ -629,13 +630,32 @@ public class SideBySide2 extends Screen {
} }
void setLineLength(int columns) { void setLineLength(int columns) {
columnMarginA.getStyle().setMarginLeft( double w = columns * getCharWidthPx();
columns * cmA.defaultCharWidth(), columnMarginA.getStyle().setMarginLeft(w, Style.Unit.PX);
Unit.PX); columnMarginB.getStyle().setMarginLeft(w, Style.Unit.PX);
}
columnMarginB.getStyle().setMarginLeft( private double getCharWidthPx() {
columns * cmB.defaultCharWidth(), if (charWidthPx <= 1) {
Unit.PX); int len = 100;
StringBuilder s = new StringBuilder();
for (int i = 0; i < len; i++) {
s.append('m');
}
Element e = DOM.createSpan();
e.getStyle().setDisplay(Style.Display.INLINE_BLOCK);
e.setInnerText(s.toString());
cmA.getMoverElement().appendChild(e);
double a = ((double) e.getOffsetWidth()) / len;
e.removeFromParent();
cmB.getMoverElement().appendChild(e);
double b = ((double) e.getOffsetWidth()) / len;
e.removeFromParent();
charWidthPx = Math.max(a, b);
}
return charWidthPx;
} }
void setShowLineNumbers(boolean b) { void setShowLineNumbers(boolean b) {