opendev/gerrit
Code Issues Proposed changes

Merge changes Icb5f77c9,Iae59a403

Browse Source 
* changes:
  SideBySide2: Draw a line under the file header when "fullscreen"
  SideBySide2: Simplify logic for showing/hiding header
This commit is contained in:
Shawn Pearce
2013-11-21 17:54:50 +00:00
committed by Gerrit Code Review
parent d55eef420b 545b000886
commit e79ed3b785
4 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
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;
@@ -36,6 +37,7 @@ class DiffTable extends Composite {
private static final Binder uiBinder = GWT.create(Binder.class); private static final Binder uiBinder = GWT.create(Binder.class);
interface DiffTableStyle extends CssResource { interface DiffTableStyle extends CssResource {
String fullscreen();
String intralineBg(); String intralineBg();
String diff(); String diff();
String activeLine(); String activeLine();
@@ -100,13 +102,16 @@ 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
|| fileCommentPanelB.getBoxCount() > 0));
if (show) {
host.header.removeStyleName(style.fullscreen());
} else { } else {
UIObject.setVisible(fileCommentRow, true); host.header.addStyleName(style.fullscreen());
} }
host.resizeCodeMirror(); host.resizeCodeMirror();
} }
@@ -117,7 +122,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/DiffTable.ui.xml
View File

@@ -23,6 +23,10 @@ limitations under the License.
@external .cm-keymap-fat-cursor, CodeMirror-cursor; @external .cm-keymap-fat-cursor, CodeMirror-cursor;
@external .cm-searching, .cm-trailingspace, .cm-tab; @external .cm-searching, .cm-trailingspace, .cm-tab;
.fullscreen {
border-bottom: 1px solid #ddd;
}
.difftable { max-width: 1484px; } .difftable { max-width: 1484px; }
.difftable .CodeMirror-lines { padding: 0; } .difftable .CodeMirror-lines { padding: 0; }
.difftable .CodeMirror pre { .difftable .CodeMirror pre {

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);
} }
} }