Merge pull request #227 from eduard13/dialog-center-position

Fixing the positioning of all Dialogs on the center screen

Author: Vitaliy

src/com/magento/idea/magento2plugin/actions/generation/dialog/AbstractDialog.java

@@ -11,9 +11,11 @@
  * All code generate dialog should extend this class
  */
 public abstract class AbstractDialog extends JDialog {
-    protected void pushToMiddle() {
-        Dimension dim = Toolkit.getDefaultToolkit().getScreenSize();
-        this.setLocation(dim.width / 2  -this.getSize().width / 2, dim.height / 2 - this.getSize().height / 2);
+    protected void centerDialog(AbstractDialog dialog) {
+        Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+        int x = screenSize.width / 2  - dialog.getSize().width / 2;
+        int y = screenSize.height / 2 - dialog.getSize().height / 2;
+        dialog.setLocation(x, y);
     }
 
     protected void onCancel() {

src/com/magento/idea/magento2plugin/actions/generation/dialog/CreateAPluginDialog.java

@@ -58,7 +58,6 @@ public CreateAPluginDialog(@NotNull Project project, Method targetMethod, PhpCla
         setContentPane(contentPane);
         setModal(true);
         getRootPane().setDefaultButton(buttonOK);
-        pushToMiddle();
         fillPluginTypeOptions();
         fillTargetAreaOptions();
 
@@ -158,6 +157,7 @@ public String getPluginModule() {
     public static void open(@NotNull Project project, Method targetMethod, PhpClass targetClass) {
         CreateAPluginDialog dialog = new CreateAPluginDialog(project, targetMethod, targetClass);
         dialog.pack();
+        dialog.centerDialog(dialog);
         dialog.setVisible(true);
     }
 

src/com/magento/idea/magento2plugin/actions/generation/dialog/CreateAnObserverDialog.java

@@ -49,7 +49,6 @@ public CreateAnObserverDialog(@NotNull Project project, String targetEvent) {
         setContentPane(contentPane);
         setModal(true);
         getRootPane().setDefaultButton(buttonOK);
-        pushToMiddle();
         fillTargetAreaOptions();
 
         buttonOK.addActionListener(new ActionListener() {
@@ -131,6 +130,7 @@ public String getObserverModule() {
     public static void open(@NotNull Project project, String targetEvent) {
         CreateAnObserverDialog dialog = new CreateAnObserverDialog(project, targetEvent);
         dialog.pack();
+        dialog.centerDialog(dialog);
         dialog.setVisible(true);
     }
 

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewBlockDialog.java

@@ -43,7 +43,6 @@ public NewBlockDialog(Project project, PsiDirectory directory) {
         setModal(true);
         setTitle("Create a new Magento 2 block..");
         getRootPane().setDefaultButton(buttonOK);
-        pushToMiddle();
         suggestBlockDirectory();
 
         buttonOK.addActionListener(new ActionListener() {
@@ -77,6 +76,7 @@ public void actionPerformed(ActionEvent e) {
     public static void open(Project project, PsiDirectory directory) {
         NewBlockDialog dialog = new NewBlockDialog(project, directory);
         dialog.pack();
+        dialog.centerDialog(dialog);
         dialog.setVisible(true);
     }
 

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewCronjobDialog.java

@@ -55,7 +55,6 @@ public NewCronjobDialog(Project project, PsiDirectory directory) {
         setModal(true);
         getRootPane().setDefaultButton(buttonOK);
         setTitle("Create a new Magento 2 cronjob..");
-        pushToMiddle();
 
         buttonOK.addActionListener(e -> onOK());
         buttonCancel.addActionListener(e -> onCancel());
@@ -119,8 +118,8 @@ public void actionPerformed(ActionEvent e) {
 
     public static void open(Project project, PsiDirectory directory) {
         NewCronjobDialog dialog = new NewCronjobDialog(project, directory);
-
         dialog.pack();
+        dialog.centerDialog(dialog);
         dialog.setVisible(true);
     }
 

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewGraphQlResolverDialog.java

@@ -41,7 +41,6 @@ public NewGraphQlResolverDialog(Project project, PsiDirectory directory) {
         setModal(true);
         setTitle("Create a new Magento 2 GraphQL Resolver.");
         getRootPane().setDefaultButton(buttonOK);
-        pushToMiddle();
         suggestGraphQlResolverDirectory();
 
         buttonOK.addActionListener(new ActionListener() {
@@ -75,6 +74,7 @@ public void actionPerformed(ActionEvent e) {
     public static void open(Project project, PsiDirectory directory) {
         NewGraphQlResolverDialog dialog = new NewGraphQlResolverDialog(project, directory);
         dialog.pack();
+        dialog.centerDialog(dialog);
         dialog.setVisible(true);
     }
 

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewModuleDialog.java

@@ -96,7 +96,6 @@ public NewModuleDialog(
         setContentPane(contentPane);
         setModal(true);
         getRootPane().setDefaultButton(buttonOK);
-        pushToMiddle();
         setLicenses();
         setModuleDependencies();
 
@@ -233,6 +232,7 @@ public List<String> getModuleDependencies() {
     public static void open(@NotNull Project project, @NotNull PsiDirectory initialBaseDir, @Nullable PsiFile file, @Nullable IdeView view, @Nullable Editor editor) {
         NewModuleDialog dialog = new NewModuleDialog(project, initialBaseDir, file, view, editor);
         dialog.pack();
+        dialog.centerDialog(dialog);
         dialog.setVisible(true);
     }
 

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewViewModelDialog.java

@@ -41,7 +41,6 @@ public NewViewModelDialog(Project project, PsiDirectory directory) {
         setModal(true);
         setTitle("Create a new Magento 2 View Model.");
         getRootPane().setDefaultButton(buttonOK);
-        pushToMiddle();
         suggestViewModelDirectory();
 
         buttonOK.addActionListener(new ActionListener() {
@@ -75,6 +74,7 @@ public void actionPerformed(ActionEvent e) {
     public static void open(Project project, PsiDirectory directory) {
         NewViewModelDialog dialog = new NewViewModelDialog(project, directory);
         dialog.pack();
+        dialog.centerDialog(dialog);
         dialog.setVisible(true);
     }
 

src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideClassByAPreferenceDialog.java

@@ -57,7 +57,6 @@ public OverrideClassByAPreferenceDialog(@NotNull Project project, PhpClass targe
         setContentPane(contentPane);
         setModal(true);
         getRootPane().setDefaultButton(buttonOK);
-        pushToMiddle();
         fillTargetAreaOptions();
         if (targetClass.isFinal()) {
             inheritClass.setVisible(false);
@@ -173,6 +172,7 @@ public boolean isInheritClass() {
     public static void open(@NotNull Project project, PhpClass targetClass) {
         OverrideClassByAPreferenceDialog dialog = new OverrideClassByAPreferenceDialog(project, targetClass);
         dialog.pack();
+        dialog.centerDialog(dialog);
         dialog.setVisible(true);
     }