From 9b0aea3624f184383a8acec52eae5525335bcd2d Mon Sep 17 00:00:00 2001 From: SiboVG Date: Sat, 12 Feb 2022 17:34:11 +0100 Subject: [PATCH 1/3] Fix nose cone config layout --- .../src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java index 6be83867e..9a6a88bb8 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java @@ -144,7 +144,7 @@ public class NoseConeConfig extends RocketComponentConfig { description = new DescriptionArea(5); description.setText(PREDESC + ((NoseCone) component).getType().getNoseConeDescription()); - panel2.add(description, "wmin 250lp, spanx, growx, wrap para"); + panel2.add(description, "w 250lp, spanx, growx, wrap para"); //// Material From 3273f152026d4ecc6983a272e7a420f9e52e6a57 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Sat, 12 Feb 2022 18:00:40 +0100 Subject: [PATCH 2/3] Fix transition config layout --- .../net/sf/openrocket/gui/configdialog/TransitionConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swing/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java index d41945b5c..8b08ef70f 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java @@ -175,7 +175,7 @@ public class TransitionConfig extends RocketComponentConfig { description = new DescriptionArea(5); description.setText(PREDESC + ((Transition) component).getType(). getTransitionDescription()); - panel2.add(description, "wmin 250lp, spanx, growx, wrap para"); + panel2.add(description, "w 250lp, spanx, growx, wrap para"); //// Material From 4d82e76d50d26ae0569bdb967bc091eab27a7204 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Sun, 13 Feb 2022 13:38:42 +0100 Subject: [PATCH 3/3] Fix DescriptionArea layout issue --- swing/src/net/sf/openrocket/gui/components/DescriptionArea.java | 1 + .../src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java | 2 +- .../net/sf/openrocket/gui/configdialog/TransitionConfig.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/components/DescriptionArea.java b/swing/src/net/sf/openrocket/gui/components/DescriptionArea.java index 91a5ad2a8..844c4909d 100644 --- a/swing/src/net/sf/openrocket/gui/components/DescriptionArea.java +++ b/swing/src/net/sf/openrocket/gui/components/DescriptionArea.java @@ -159,6 +159,7 @@ public class DescriptionArea extends JScrollPane { Dimension dim = editorPane.getPreferredSize(); dim.height = lineheight * rows + extraheight + 2; + this.setPreferredSize(dim); this.setViewportView(editorPane); this.setText(text); diff --git a/swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java index 9a6a88bb8..6be83867e 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java @@ -144,7 +144,7 @@ public class NoseConeConfig extends RocketComponentConfig { description = new DescriptionArea(5); description.setText(PREDESC + ((NoseCone) component).getType().getNoseConeDescription()); - panel2.add(description, "w 250lp, spanx, growx, wrap para"); + panel2.add(description, "wmin 250lp, spanx, growx, wrap para"); //// Material diff --git a/swing/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java index 8b08ef70f..d41945b5c 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java @@ -175,7 +175,7 @@ public class TransitionConfig extends RocketComponentConfig { description = new DescriptionArea(5); description.setText(PREDESC + ((Transition) component).getType(). getTransitionDescription()); - panel2.add(description, "w 250lp, spanx, growx, wrap para"); + panel2.add(description, "wmin 250lp, spanx, growx, wrap para"); //// Material