Fixed aspect of two Cancel buttons.

diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/GridGenerationDialog.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/GridGenerationDialog.java
index d3dded4..d5e704d 100644 (file)
--- a/src/classes/net/jankenpoi/sudokuki/ui/swing/GridGenerationDialog.java
+++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/GridGenerationDialog.java
@@ -20,6 +20,7 @@ package net.jankenpoi.sudokuki.ui.swing;
 import static net.jankenpoi.i18n.I18n._;\r
 \r
 import java.awt.Container;\r
+import java.awt.FlowLayout;\r
 import java.awt.GridLayout;\r
 import java.util.concurrent.ExecutionException;\r
 \r
@@ -27,6 +28,7 @@ import javax.swing.JButton;
 import javax.swing.JDialog;\r
 import javax.swing.JFrame;\r
 import javax.swing.JLabel;\r
+import javax.swing.JPanel;\r
 import javax.swing.SwingWorker;\r
 \r
 import net.jankenpoi.sudokuki.view.GridView;\r
@@ -92,8 +94,8 @@ public class GridGenerationDialog extends JDialog {
                setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);\r
 \r
                Container pane = getContentPane();\r
-               GridLayout btnLayout = new GridLayout(3, 1);\r
-               pane.setLayout(btnLayout);\r
+               GridLayout layout = new GridLayout(3, 1);\r
+               pane.setLayout(layout);\r
 \r
                \r
                JLabel messageLbl1 = new JLabel(        \r
@@ -114,8 +116,13 @@ public class GridGenerationDialog extends JDialog {
 \r
                pane.add(messageLbl1);\r
                pane.add(messageLbl3);\r
-               pane.add(cancelBtn);\r
 \r
+        FlowLayout btnLayout = new FlowLayout(1);\r
+        JPanel btnPanel = new JPanel();\r
+        btnPanel.setLayout(btnLayout);\r
+        btnPanel.add(cancelBtn);\r
+        pane.add(btnPanel);\r
+               \r
                pack();\r
                setLocationRelativeTo(parent);\r
        }\r

diff --git a/src/classes/net/jankenpoi/sudokuki/ui/swing/ResolveGridDialog.java b/src/classes/net/jankenpoi/sudokuki/ui/swing/ResolveGridDialog.java
index 4b77efc..34d1626 100644 (file)
--- a/src/classes/net/jankenpoi/sudokuki/ui/swing/ResolveGridDialog.java
+++ b/src/classes/net/jankenpoi/sudokuki/ui/swing/ResolveGridDialog.java
@@ -20,6 +20,7 @@ package net.jankenpoi.sudokuki.ui.swing;
 import static net.jankenpoi.i18n.I18n._;\r
 \r
 import java.awt.Container;\r
+import java.awt.FlowLayout;\r
 import java.awt.GridLayout;\r
 import java.util.concurrent.ExecutionException;\r
 \r
@@ -27,6 +28,7 @@ import javax.swing.JButton;
 import javax.swing.JDialog;\r
 import javax.swing.JFrame;\r
 import javax.swing.JLabel;\r
+import javax.swing.JPanel;\r
 import javax.swing.SwingWorker;\r
 \r
 import net.jankenpoi.sudokuki.model.GridModel;\r
@@ -102,8 +104,8 @@ public class ResolveGridDialog extends JDialog {
                setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);\r
 \r
                Container pane = getContentPane();\r
-               GridLayout btnLayout = new GridLayout(3, 1);\r
-               pane.setLayout(btnLayout);\r
+               GridLayout layout = new GridLayout(3, 1);\r
+               pane.setLayout(layout);\r
 \r
                \r
                JLabel messageLbl1 = new JLabel(        \r
@@ -123,8 +125,13 @@ public class ResolveGridDialog extends JDialog {
 \r
                pane.add(messageLbl1);\r
                pane.add(messageLbl3);\r
-               pane.add(cancelBtn);\r
 \r
+        FlowLayout btnLayout = new FlowLayout(1);\r
+        JPanel btnPanel = new JPanel();\r
+        btnPanel.setLayout(btnLayout);\r
+        btnPanel.add(cancelBtn);\r
+        pane.add(btnPanel);\r
+        \r
                pack();\r
                setLocationRelativeTo(parent);\r
        }\r