Skip to content

Commit 567cb15

Browse files
committed
Fixing the center position of all Dialogs
1 parent 267f558 commit 567cb15

9 files changed

+13
-12
lines changed

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

+5-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@
1111
* All code generate dialog should extend this class
1212
*/
1313
public abstract class AbstractDialog extends JDialog {
14-
protected void pushToMiddle() {
15-
Dimension dim = Toolkit.getDefaultToolkit().getScreenSize();
16-
this.setLocation(dim.width / 2 -this.getSize().width / 2, dim.height / 2 - this.getSize().height / 2);
14+
protected void centerDialog(AbstractDialog dialog) {
15+
Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
16+
int x = screenSize.width / 2 - dialog.getSize().width / 2;
17+
int y = screenSize.height / 2 - dialog.getSize().height / 2;
18+
dialog.setLocation(x, y);
1719
}
1820

1921
protected void onCancel() {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ public CreateAPluginDialog(@NotNull Project project, Method targetMethod, PhpCla
5858
setContentPane(contentPane);
5959
setModal(true);
6060
getRootPane().setDefaultButton(buttonOK);
61-
pushToMiddle();
6261
fillPluginTypeOptions();
6362
fillTargetAreaOptions();
6463

@@ -158,6 +157,7 @@ public String getPluginModule() {
158157
public static void open(@NotNull Project project, Method targetMethod, PhpClass targetClass) {
159158
CreateAPluginDialog dialog = new CreateAPluginDialog(project, targetMethod, targetClass);
160159
dialog.pack();
160+
dialog.centerDialog(dialog);
161161
dialog.setVisible(true);
162162
}
163163

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public CreateAnObserverDialog(@NotNull Project project, String targetEvent) {
4949
setContentPane(contentPane);
5050
setModal(true);
5151
getRootPane().setDefaultButton(buttonOK);
52-
pushToMiddle();
5352
fillTargetAreaOptions();
5453

5554
buttonOK.addActionListener(new ActionListener() {
@@ -131,6 +130,7 @@ public String getObserverModule() {
131130
public static void open(@NotNull Project project, String targetEvent) {
132131
CreateAnObserverDialog dialog = new CreateAnObserverDialog(project, targetEvent);
133132
dialog.pack();
133+
dialog.centerDialog(dialog);
134134
dialog.setVisible(true);
135135
}
136136

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public NewBlockDialog(Project project, PsiDirectory directory) {
4343
setModal(true);
4444
setTitle("Create a new Magento 2 block..");
4545
getRootPane().setDefaultButton(buttonOK);
46-
pushToMiddle();
4746
suggestBlockDirectory();
4847

4948
buttonOK.addActionListener(new ActionListener() {
@@ -77,6 +76,7 @@ public void actionPerformed(ActionEvent e) {
7776
public static void open(Project project, PsiDirectory directory) {
7877
NewBlockDialog dialog = new NewBlockDialog(project, directory);
7978
dialog.pack();
79+
dialog.centerDialog(dialog);
8080
dialog.setVisible(true);
8181
}
8282

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ public NewCronjobDialog(Project project, PsiDirectory directory) {
5555
setModal(true);
5656
getRootPane().setDefaultButton(buttonOK);
5757
setTitle("Create a new Magento 2 cronjob..");
58-
pushToMiddle();
5958

6059
buttonOK.addActionListener(e -> onOK());
6160
buttonCancel.addActionListener(e -> onCancel());
@@ -119,8 +118,8 @@ public void actionPerformed(ActionEvent e) {
119118

120119
public static void open(Project project, PsiDirectory directory) {
121120
NewCronjobDialog dialog = new NewCronjobDialog(project, directory);
122-
123121
dialog.pack();
122+
dialog.centerDialog(dialog);
124123
dialog.setVisible(true);
125124
}
126125

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ public NewGraphQlResolverDialog(Project project, PsiDirectory directory) {
4141
setModal(true);
4242
setTitle("Create a new Magento 2 GraphQL Resolver.");
4343
getRootPane().setDefaultButton(buttonOK);
44-
pushToMiddle();
4544
suggestGraphQlResolverDirectory();
4645

4746
buttonOK.addActionListener(new ActionListener() {
@@ -75,6 +74,7 @@ public void actionPerformed(ActionEvent e) {
7574
public static void open(Project project, PsiDirectory directory) {
7675
NewGraphQlResolverDialog dialog = new NewGraphQlResolverDialog(project, directory);
7776
dialog.pack();
77+
dialog.centerDialog(dialog);
7878
dialog.setVisible(true);
7979
}
8080

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ public NewModuleDialog(
9696
setContentPane(contentPane);
9797
setModal(true);
9898
getRootPane().setDefaultButton(buttonOK);
99-
pushToMiddle();
10099
setLicenses();
101100
setModuleDependencies();
102101

@@ -233,6 +232,7 @@ public List<String> getModuleDependencies() {
233232
public static void open(@NotNull Project project, @NotNull PsiDirectory initialBaseDir, @Nullable PsiFile file, @Nullable IdeView view, @Nullable Editor editor) {
234233
NewModuleDialog dialog = new NewModuleDialog(project, initialBaseDir, file, view, editor);
235234
dialog.pack();
235+
dialog.centerDialog(dialog);
236236
dialog.setVisible(true);
237237
}
238238

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ public NewViewModelDialog(Project project, PsiDirectory directory) {
4141
setModal(true);
4242
setTitle("Create a new Magento 2 View Model.");
4343
getRootPane().setDefaultButton(buttonOK);
44-
pushToMiddle();
4544
suggestViewModelDirectory();
4645

4746
buttonOK.addActionListener(new ActionListener() {
@@ -75,6 +74,7 @@ public void actionPerformed(ActionEvent e) {
7574
public static void open(Project project, PsiDirectory directory) {
7675
NewViewModelDialog dialog = new NewViewModelDialog(project, directory);
7776
dialog.pack();
77+
dialog.centerDialog(dialog);
7878
dialog.setVisible(true);
7979
}
8080

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ public OverrideClassByAPreferenceDialog(@NotNull Project project, PhpClass targe
5757
setContentPane(contentPane);
5858
setModal(true);
5959
getRootPane().setDefaultButton(buttonOK);
60-
pushToMiddle();
6160
fillTargetAreaOptions();
6261
if (targetClass.isFinal()) {
6362
inheritClass.setVisible(false);
@@ -173,6 +172,7 @@ public boolean isInheritClass() {
173172
public static void open(@NotNull Project project, PhpClass targetClass) {
174173
OverrideClassByAPreferenceDialog dialog = new OverrideClassByAPreferenceDialog(project, targetClass);
175174
dialog.pack();
175+
dialog.centerDialog(dialog);
176176
dialog.setVisible(true);
177177
}
178178

0 commit comments

Comments
 (0)