From 5a6aa093af3e91d2f38021bd835a877c740283f6 Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Wed, 21 Oct 2020 15:18:51 +0300
Subject: [PATCH 1/2] Fixing the dialog size. Fixing adding new fieldset

---
 .../generation/dialog/NewUiComponentFormDialog.form   |  4 ++--
 .../generation/dialog/NewUiComponentFormDialog.java   | 11 +++--------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewUiComponentFormDialog.form b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewUiComponentFormDialog.form
index e67dac8c5..43536d755 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewUiComponentFormDialog.form
+++ b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewUiComponentFormDialog.form
@@ -3,10 +3,10 @@
   <grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="12" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>
-      <xy x="48" y="54" width="888" height="657"/>
+      <xy x="48" y="54" width="1056" height="1327"/>
     </constraints>
     <properties>
-      <preferredSize width="400" height="600"/>
+      <preferredSize width="838" height="619"/>
     </properties>
     <border type="none"/>
     <children>
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewUiComponentFormDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewUiComponentFormDialog.java
index dc6626224..35ca435ea 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewUiComponentFormDialog.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewUiComponentFormDialog.java
@@ -205,7 +205,6 @@ public class NewUiComponentFormDialog extends AbstractDialog {
     public NewUiComponentFormDialog(final Project project, final PsiDirectory directory) {
         super();
         this.project = project;
-        updateDialogSizeToDefaults();
         formButtonsValidator = new FormButtonsValidator(this);
         formFieldsetsValidator = new FormFieldsetsValidator(this);
         formFieldsValidator = new FormFieldsValidator(this);
@@ -286,9 +285,10 @@ protected void initButtonsTable() {
     }
 
     protected void initFieldSetsTable() {
+        Integer rowPosition = 10;
         final DefaultTableModel model = getFieldsetsModel();
         model.setDataVector(
-                new Object[][] {{"General","10",DELETE_COLUMN}},
+                new Object[][] {{"General", rowPosition, DELETE_COLUMN}},
                 new Object[] { LABEL_COLUMN, SORT_ORDER_COLUMN, ACTION_COLUMN}
         );
 
@@ -298,7 +298,7 @@ protected void initFieldSetsTable() {
                 new DeleteRowButton(new JCheckBox()));
 
         addFieldset.addActionListener(e -> {
-            model.addRow(new Object[] {"","",DELETE_COLUMN});
+            model.addRow(new Object[] {"", rowPosition + 10, DELETE_COLUMN});
         });
         model.addTableModelListener(
                 event -> {
@@ -753,9 +753,4 @@ protected boolean validateFormFields() {
                 && formFieldsetsValidator.validate()
                 && formFieldsValidator.validate();
     }
-
-    private void updateDialogSizeToDefaults() {
-        final Dimension screenSize = getToolkit().getScreenSize();
-        setPreferredSize(new Dimension(screenSize.width / 2, screenSize.height / 2));
-    }
 }

From 33cd5c399fc7e49f8f9bd6b645aa1965feb7fc56 Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Thu, 22 Oct 2020 08:07:38 +0300
Subject: [PATCH 2/2] Fixing static tests

---
 .../actions/generation/dialog/NewUiComponentFormDialog.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewUiComponentFormDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewUiComponentFormDialog.java
index 0f73a9178..7875c59df 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewUiComponentFormDialog.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewUiComponentFormDialog.java
@@ -53,7 +53,6 @@
 import com.magento.idea.magento2plugin.ui.table.TableButton;
 import com.magento.idea.magento2plugin.util.magento.GetAclResourcesListUtil;
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
-import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
@@ -285,7 +284,7 @@ protected void initButtonsTable() {
     }
 
     protected void initFieldSetsTable() {
-        Integer rowPosition = 10;
+        final Integer rowPosition = 10;
         final DefaultTableModel model = getFieldsetsModel();
         model.setDataVector(
                 new Object[][] {{"General", rowPosition, DELETE_COLUMN}},