SideBySide2: Clean up resizeCodeMirror() method
When this methods runs cmA cannot be null, the test is never true.
Compute the height only once and pass it to both instances, then
tell them to reflow any content. This is slightly easier to follow
and ensures the computed height is the same.
DiffTable does not need an onLoad() method. The widgets in question
default in their ui.xml to being visible. Passing false was asking
the method to make them visible, and they are already visible.
Change-Id: I9346791ce51b1727f3ab00f8c23a39cdc62ac940
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.java
index e736783..5609ae2 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.java
@@ -103,11 +103,6 @@
this.host = host;
}
- @Override
- protected void onLoad() {
- updateFileCommentVisibility(false);
- }
-
void updateFileCommentVisibility(boolean forceHide) {
UIObject.setVisible(patchSetNavRow, !forceHide);
if (forceHide || (fileCommentPanelA.getBoxCount() == 0 &&
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
index 5150b30..0f07de0 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
@@ -1241,16 +1241,14 @@
}
void resizeCodeMirror() {
- if (cmA == null) {
- return;
- }
- int h = Gerrit.getHeaderFooterHeight()
+ int rest = Gerrit.getHeaderFooterHeight()
+ header.getOffsetHeight()
+ diffTable.getHeaderHeight()
+ 10; // Estimate
- cmA.setHeight(Window.getClientHeight() - h);
+ int h = Window.getClientHeight() - rest;
+ cmA.setHeight(h);
+ cmB.setHeight(h);
cmA.refresh();
- cmB.setHeight(Window.getClientHeight() - h);
cmB.refresh();
diffTable.sidePanel.adjustGutters(cmB);
}
