opendev/gerrit
Code Issues Proposed changes

SideBySide2: Simplify logic for showing/hiding header

Browse Source 
The file header and Gerrit menus should show/hide together.
Consolidate the logic for this into one place and simplify the
conditional value to be consistent between them:

  true means show headers,
  false means hide headers.

Change-Id: Iae59a40369ef698279eee2c1faa2b147fbb622c8
This commit is contained in:
Shawn Pearce
2013-11-21 01:33:15 -08:00
committed by Michael Zhou
parent a4f6c6d325
commit 78e400cde3
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.java
View File

@@ -14,6 +14,7 @@
package com.google.gerrit.client.diff; package com.google.gerrit.client.diff;
import com.google.gerrit.client.Gerrit;
import com.google.gerrit.client.changes.ChangeInfo.RevisionInfo; import com.google.gerrit.client.changes.ChangeInfo.RevisionInfo;
import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.GWT;
@@ -100,14 +101,12 @@ class DiffTable extends Composite {
this.host = host; this.host = host;
} }
void updateFileCommentVisibility(boolean forceHide) { void setHeaderVisible(boolean show) {
UIObject.setVisible(patchSetNavRow, !forceHide); Gerrit.setHeaderVisible(show);
if (forceHide || (fileCommentPanelA.getBoxCount() == 0 && UIObject.setVisible(patchSetNavRow, show);
fileCommentPanelB.getBoxCount() == 0)) { UIObject.setVisible(fileCommentRow, show
UIObject.setVisible(fileCommentRow, false); && (fileCommentPanelA.getBoxCount() > 0
} else { || fileCommentPanelB.getBoxCount() > 0));
UIObject.setVisible(fileCommentRow, true);
}
host.resizeCodeMirror(); host.resizeCodeMirror();
} }
@@ -117,7 +116,7 @@ class DiffTable extends Composite {
void createOrEditFileComment(DisplaySide side) { void createOrEditFileComment(DisplaySide side) {
getPanelFromSide(side).createOrEditFileComment(); getPanelFromSide(side).createOrEditFileComment();
updateFileCommentVisibility(false); setHeaderVisible(true);
} }
void addFileCommentBox(CommentBox box) { void addFileCommentBox(CommentBox box) {

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/FileCommentPanel.java
View File

@@ -74,11 +74,11 @@ class FileCommentPanel extends Composite {
void addFileComment(CommentBox box) { void addFileComment(CommentBox box) {
boxes.add(box); boxes.add(box);
body.add(box); body.add(box);
table.updateFileCommentVisibility(false); table.setHeaderVisible(true);
} }
void onRemoveDraftBox(DraftBox box) { void onRemoveDraftBox(DraftBox box) {
boxes.remove(box); boxes.remove(box);
table.updateFileCommentVisibility(false); table.setHeaderVisible(true);
} }
} }

6
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/ScrollSynchronizer.java
View File

@@ -39,12 +39,10 @@ class ScrollSynchronizer {
private void updateScreenHeader(ScrollInfo si) { private void updateScreenHeader(ScrollInfo si) {
if (si.getTop() == 0 && !Gerrit.isHeaderVisible()) { if (si.getTop() == 0 && !Gerrit.isHeaderVisible()) {
Gerrit.setHeaderVisible(true); diffTable.setHeaderVisible(true);
diffTable.updateFileCommentVisibility(false);
} else if (si.getTop() > 0.5 * si.getClientHeight() } else if (si.getTop() > 0.5 * si.getClientHeight()
&& Gerrit.isHeaderVisible()) { && Gerrit.isHeaderVisible()) {
Gerrit.setHeaderVisible(false); diffTable.setHeaderVisible(false);
diffTable.updateFileCommentVisibility(true);
} }
} }