Merge "InlineEdit: Adapt SBS2 to recently made code changes"

gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.java

@@ -433,7 +433,7 @@ public class ChangeScreen2 extends Screen {
         reviewMode.setVisible(!editMode.isVisible());
         editFileAction = new EditFileAction(
             new PatchSet.Id(changeId, edit == null ? rev._number() : 0),
-            "", "", style.replyBox(), editMessage, reply);
+            "", "", style, editMessage, reply);
       } else {
         editMode.setVisible(false);
         addFile.setVisible(false);

gerrit-gwtui/src/main/java/com/google/gerrit/client/change/EditFileAction.java

@@ -22,22 +22,22 @@ import com.google.gwt.user.client.ui.Widget;
 import com.google.gwtexpui.globalkey.client.GlobalKey;
 import com.google.gwtexpui.user.client.PluginSafePopupPanel;
 
-public class EditFileAction {
+class EditFileAction {
  private final PatchSet.Id id;
  private final String content;
  private final String file;
- private final String style;
+ private final ChangeScreen2.Style style;
  private final Widget editMessageButton;
  private final Widget relativeTo;
 
  private EditFileBox editBox;
  private PopupPanel popup;
 
- public EditFileAction(
+ EditFileAction(
      PatchSet.Id id,
      String content,
      String file,
-     String style,
+     ChangeScreen2.Style style,
      Widget editButton,
      Widget relativeTo) {
    this.id = id;
@@ -62,10 +62,8 @@ public class EditFileAction {
    }
 
    final PluginSafePopupPanel p = new PluginSafePopupPanel(true);
-   p.setStyleName(style);
-   if (editMessageButton != null) {
-     p.addAutoHidePartner(editMessageButton.getElement());
-   }
+   p.setStyleName(style.replyBox());
+   p.addAutoHidePartner(editMessageButton.getElement());
    p.addCloseHandler(new CloseHandler<PopupPanel>() {
      @Override
      public void onClose(CloseEvent<PopupPanel> event) {

gerrit-gwtui/src/main/java/com/google/gerrit/client/change/FileTable.java

@@ -332,7 +332,7 @@ public class FileTable extends FlowPanel {
             @Override
             public void onSuccess(String result) {
               EditFileAction edit = new EditFileAction(
-                  id, result, path, style.replyBox(), editButton, replyButton);
+                  id, result, path, style, editButton, replyButton);
               edit.onEdit();
             }
           });

gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSetSelectBox2.java

@@ -52,7 +52,6 @@ class PatchSetSelectBox2 extends Composite {
 
   interface BoxStyle extends CssResource {
     String selected();
-    String replyBox();
   }
 
   @UiField Image icon;

gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSetSelectBox2.ui.xml

@@ -56,10 +56,6 @@ limitations under the License.
     .iconCell {
       width: 16px;
     }
-    .replyBox {
-      background-color: trimColor;
-      z-index: 10;
-    }
   </ui:style>
   <g:HTMLPanel>
     <table class='{style.table}'>