From 50a53b516b8567f2a013c0b595d6fdab37fb47bf Mon Sep 17 00:00:00 2001
From: 2xsaiko
Date: Wed, 3 Jun 2020 21:46:50 +0200
Subject: Fix dialogs for scale

---
 .../java/cuchaz/enigma/gui/dialog/AbstractDialog.java     | 15 +++++----------
 .../cuchaz/enigma/gui/dialog/ConnectToServerDialog.java   |  6 +++++-
 .../java/cuchaz/enigma/gui/dialog/CreateServerDialog.java |  6 +++++-
 3 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'enigma-swing/src/main/java')

diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/AbstractDialog.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/AbstractDialog.java
index a4d8e1f5..b179eac1 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/AbstractDialog.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/AbstractDialog.java
@@ -8,6 +8,7 @@ import javax.swing.JDialog;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
+import cuchaz.enigma.gui.util.ScaleUtil;
 import cuchaz.enigma.utils.I18n;
 import cuchaz.enigma.utils.Pair;
 import cuchaz.enigma.utils.validation.ValidationContext;
@@ -34,7 +35,7 @@ public abstract class AbstractDialog extends JDialog {
 			Component component = entry.b;
 
 			c.gridy = i;
-			c.insets = new Insets(4, 4, 4, 4);
+			c.insets = ScaleUtil.getInsets(4, 4, 4, 4);
 
 			c.gridx = 0;
 			c.weightx = 0.0;
@@ -49,19 +50,13 @@ public abstract class AbstractDialog extends JDialog {
 			inputContainer.add(component, c);
 		}
 		contentPane.add(inputContainer, BorderLayout.CENTER);
-		Container buttonContainer = new JPanel(new GridBagLayout());
-		c = new GridBagConstraints();
-		c.weightx = 1.0;
-		c.insets = new Insets(4, 4, 4, 4);
-		c.anchor = GridBagConstraints.LINE_END;
+		Container buttonContainer = new JPanel(new FlowLayout(FlowLayout.RIGHT, ScaleUtil.scale(4), ScaleUtil.scale(4)));
 		JButton connectButton = new JButton(I18n.translate(confirmAction));
 		connectButton.addActionListener(event -> confirm());
-		buttonContainer.add(connectButton, c);
-		c.weightx = 0.0;
-		c.anchor = GridBagConstraints.CENTER;
+		buttonContainer.add(connectButton);
 		JButton abortButton = new JButton(I18n.translate(cancelAction));
 		abortButton.addActionListener(event -> cancel());
-		buttonContainer.add(abortButton, c);
+		buttonContainer.add(abortButton);
 		contentPane.add(buttonContainer, BorderLayout.SOUTH);
 
 		pack();
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/ConnectToServerDialog.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/ConnectToServerDialog.java
index 79b0c4e0..d78e5654 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/ConnectToServerDialog.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/ConnectToServerDialog.java
@@ -11,6 +11,7 @@ import javax.swing.JPasswordField;
 import javax.swing.JTextField;
 
 import cuchaz.enigma.gui.elements.ValidatableTextField;
+import cuchaz.enigma.gui.util.ScaleUtil;
 import cuchaz.enigma.network.EnigmaServer;
 import cuchaz.enigma.utils.Pair;
 import cuchaz.enigma.utils.ServerAddress;
@@ -25,7 +26,10 @@ public class ConnectToServerDialog extends AbstractDialog {
 	public ConnectToServerDialog(Frame owner) {
 		super(owner, "prompt.connect.title", "prompt.connect.confirm", "prompt.cancel");
 
-		setSize(new Dimension(400, 185));
+		Dimension preferredSize = getPreferredSize();
+		preferredSize.width = ScaleUtil.scale(400);
+		setPreferredSize(preferredSize);
+		pack();
 		setLocationRelativeTo(owner);
 	}
 
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/CreateServerDialog.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/CreateServerDialog.java
index f2bc7dbe..ddd3bc37 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/CreateServerDialog.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/dialog/CreateServerDialog.java
@@ -8,6 +8,7 @@ import java.util.List;
 
 import cuchaz.enigma.gui.elements.ValidatablePasswordField;
 import cuchaz.enigma.gui.elements.ValidatableTextField;
+import cuchaz.enigma.gui.util.ScaleUtil;
 import cuchaz.enigma.network.EnigmaServer;
 import cuchaz.enigma.utils.Pair;
 import cuchaz.enigma.utils.validation.Message;
@@ -21,7 +22,10 @@ public class CreateServerDialog extends AbstractDialog {
 	public CreateServerDialog(Frame owner) {
 		super(owner, "prompt.create_server.title", "prompt.create_server.confirm", "prompt.cancel");
 
-		setSize(new Dimension(400, 150));
+		Dimension preferredSize = getPreferredSize();
+		preferredSize.width = ScaleUtil.scale(400);
+		setPreferredSize(preferredSize);
+		pack();
 		setLocationRelativeTo(owner);
 	}
 
-- 
cgit v1.2.3