Merge pull request #5200 from rstudio/bugfix/inline-context-git-diff-…

…ctrl fix regression in layout of git diff window
rstudio · Aug 9, 2019 · 91b5f2d · 91b5f2d
2 parents 4623e2c + e3f1182
commit 91b5f2d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/gwt/src/org/rstudio/core/client/widget/FormLabel.java b/src/gwt/src/org/rstudio/core/client/widget/FormLabel.java
@@ -152,4 +152,12 @@ public void setFor(String controlId)
    {
       getElement().setAttribute("for", controlId);
    }
+
+   /**
+    * @param display directly set display attribute of the label element
+    */
+   public void setDisplay(String display)
+   {
+      getElement().getStyle().setProperty("display", display);
+   }
 }
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/vcs/git/dialog/GitReviewPanel.ui.xml b/src/gwt/src/org/rstudio/studio/client/workbench/views/vcs/git/dialog/GitReviewPanel.ui.xml
@@ -54,7 +54,7 @@
                                     text="Unstaged"
                                     checked="true"
                                     styleName="{res.styles.unstaged}"/>
-                     <rs_widget:FormLabel ui:field="lblContext_" text="Context" styleName="{res.styles.stagedLabel}"/>
+                     <rs_widget:FormLabel ui:field="lblContext_" display="inline" text="Context" styleName="{res.styles.stagedLabel}"/>
                      <g:ListBox ui:field="contextLines_" visibleItemCount="1" selectedIndex="0">
                         <g:item value="5">5 line</g:item>
                         <g:item value="10">10 line</g:item>