From 3b9aaaf776316ed7e417ea19397e5f4d6c8cba0a Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Wed, 18 Jul 2018 11:56:06 +0300
Subject: [PATCH] ui: improve layout in library properties editor (UX-249)

Fixed alignment of 'Edit' button and the label text (item 6 in https://youtrack.jetbrains.com/issue/UX-249#focus=streamItem-27-2922582-0-0).
---
 .../src/com/intellij/jarRepository/RepositoryLibraryType.java | 2 +-
 .../libraryEditor/LibraryPropertiesEditorBase.form            | 4 ++--
 .../libraryEditor/LibraryPropertiesEditorBase.java            | 2 ++
 .../src/com/intellij/openapi/ui/NamedConfigurable.java        | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/java/idea-ui/src/com/intellij/jarRepository/RepositoryLibraryType.java b/java/idea-ui/src/com/intellij/jarRepository/RepositoryLibraryType.java
index 18870efe1c75..a49ea14ef627 100644
--- a/java/idea-ui/src/com/intellij/jarRepository/RepositoryLibraryType.java
+++ b/java/idea-ui/src/com/intellij/jarRepository/RepositoryLibraryType.java
@@ -82,6 +82,6 @@ public class RepositoryLibraryType extends LibraryType<RepositoryLibraryProperti
   @Override
   public String getDescription(@NotNull RepositoryLibraryProperties properties) {
     RepositoryLibraryDescription description = RepositoryLibraryDescription.findDescription(properties);
-    return description.getDisplayName(properties.getVersion());
+    return "Maven: " + description.getDisplayName(properties.getVersion());
   }
 }
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryPropertiesEditorBase.form b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryPropertiesEditorBase.form
index b0ccb4442fa0..6f0a8bd9a8a8 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryPropertiesEditorBase.form
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryPropertiesEditorBase.form
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.openapi.roots.ui.configuration.libraryEditor.LibraryPropertiesEditorBase">
   <grid id="27dc6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-    <margin top="0" left="5" bottom="0" right="5"/>
+    <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="500" height="37"/>
+      <xy x="20" y="20" width="500" height="34"/>
     </constraints>
     <properties/>
     <border type="none"/>
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryPropertiesEditorBase.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryPropertiesEditorBase.java
index 7467d1263fa4..8e06e9bef21c 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryPropertiesEditorBase.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryPropertiesEditorBase.java
@@ -19,6 +19,7 @@ import com.intellij.openapi.roots.libraries.LibraryProperties;
 import com.intellij.openapi.roots.libraries.LibraryType;
 import com.intellij.openapi.roots.libraries.ui.LibraryEditorComponent;
 import com.intellij.openapi.roots.libraries.ui.LibraryPropertiesEditor;
+import com.intellij.util.ui.JBUI;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -53,6 +54,7 @@ public abstract class LibraryPropertiesEditorBase<P extends LibraryProperties, T
         edit();
       }
     });
+    myMainPanel.setBorder(JBUI.Borders.empty(0, 10, 5, 10));
   }
 
   protected JPanel getMainPanel() {
diff --git a/platform/platform-api/src/com/intellij/openapi/ui/NamedConfigurable.java b/platform/platform-api/src/com/intellij/openapi/ui/NamedConfigurable.java
index c6d3c43d27c0..0e6ae3ebe529 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/NamedConfigurable.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/NamedConfigurable.java
@@ -22,11 +22,11 @@ import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.ui.DocumentAdapter;
 import com.intellij.ui.ErrorLabel;
 import com.intellij.ui.JBColor;
+import com.intellij.util.ui.JBUI;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import javax.swing.border.EmptyBorder;
 import javax.swing.event.DocumentEvent;
 import java.awt.*;
 
@@ -65,7 +65,7 @@ public abstract class NamedConfigurable<T> implements Configurable {
         }
       });
     }
-    myNamePanel.setBorder(new EmptyBorder(10, 10, 6, 10));
+    myNamePanel.setBorder(JBUI.Borders.empty(10, 10, 6, 10));
   }
 
   public boolean isNameEditable() {