From 2ecb761f3bba989819c431b9f18fbd5f8c0ff327 Mon Sep 17 00:00:00 2001 From: SJOS Date: Mon, 10 Oct 2022 20:05:55 +0200 Subject: [PATCH 1/2] Fix size problem for some languages in Founding Fathers dialog --- .../gui/dialog/ChooseFoundingFatherDialog.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/net/sf/freecol/client/gui/dialog/ChooseFoundingFatherDialog.java b/src/net/sf/freecol/client/gui/dialog/ChooseFoundingFatherDialog.java index df39433feb..72dfee9507 100644 --- a/src/net/sf/freecol/client/gui/dialog/ChooseFoundingFatherDialog.java +++ b/src/net/sf/freecol/client/gui/dialog/ChooseFoundingFatherDialog.java @@ -22,10 +22,7 @@ import java.util.List; import java.util.logging.Logger; -import javax.swing.JButton; -import javax.swing.JFrame; -import javax.swing.JPanel; -import javax.swing.JTabbedPane; +import javax.swing.*; import net.miginfocom.swing.MigLayout; import net.sf.freecol.client.FreeColClient; @@ -88,8 +85,13 @@ public ChooseFoundingFatherDialog(FreeColClient freeColClient, JFrame frame, tb.setSelectedIndex(0); JPanel panel = new MigPanel(new MigLayout("wrap 1", "align center")); - panel.add(Utility.localizedHeader("chooseFoundingFatherDialog.title", - Utility.FONTSPEC_TITLE)); + JLabel title = Utility.localizedHeader("chooseFoundingFatherDialog.title", + Utility.FONTSPEC_TITLE); + if (title.getPreferredSize().getWidth() < 425) { + panel.add(title, "width 425"); + } else { + panel.add(title); + } panel.add(helpButton, "tag help"); panel.add(tb, "width 100%"); From 6b78756a622a5cfb5c06081ef3ad76cfe5e1d64b Mon Sep 17 00:00:00 2001 From: SJOS Date: Mon, 10 Oct 2022 20:07:34 +0200 Subject: [PATCH 2/2] Fix import statements --- .../client/gui/dialog/ChooseFoundingFatherDialog.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/net/sf/freecol/client/gui/dialog/ChooseFoundingFatherDialog.java b/src/net/sf/freecol/client/gui/dialog/ChooseFoundingFatherDialog.java index 72dfee9507..81cdf0a4f1 100644 --- a/src/net/sf/freecol/client/gui/dialog/ChooseFoundingFatherDialog.java +++ b/src/net/sf/freecol/client/gui/dialog/ChooseFoundingFatherDialog.java @@ -22,7 +22,11 @@ import java.util.List; import java.util.logging.Logger; -import javax.swing.*; +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JTabbedPane; import net.miginfocom.swing.MigLayout; import net.sf.freecol.client.FreeColClient;