hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't let appearance panel widgets space out vertically + others

Browse Source
This commit is contained in:
SiboVG 2023-01-11 01:43:33 +01:00
parent b6c581ffa5
commit 8a7f28e03c
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java
View File

@ -210,7 +210,7 @@ public class AppearancePanel extends JPanel {
* @param order component traversal order object of the component config dialog
*/
public AppearancePanel(final OpenRocketDocument document, final RocketComponent c, final JDialog parent, List<Component> order) {
super(new MigLayout("fill", "[150][grow][150][grow]"));
super(new MigLayout("fillx", "[150][grow][150][grow]"));
this.order = order;
defaultAppearance = DefaultAppearance.getDefaultAppearance(c);
@ -604,6 +604,7 @@ public class AppearancePanel extends JPanel {
});
p.add(editBtn);
// TODO: move the separate columns in two separate panels instead of adding them in a zig-zag way
// Color
panel.add(new JLabel(trans.get("AppearanceCfg.lbl.color.Color")));
mDefault.addEnableComponent(colorButton, false);
@ -611,14 +612,14 @@ public class AppearancePanel extends JPanel {
order.add(colorButton);
// Scale
panel.add(new JLabel(trans.get("AppearanceCfg.lbl.texture.scale")));
panel.add(new JLabel(trans.get("AppearanceCfg.lbl.texture.scale")), "gapleft para");
panel.add(new JLabel("x:"), "split 4");
JSpinner scaleU = new JSpinner(new DoubleModel(builder, "ScaleX",
TEXTURE_UNIT).getSpinnerModel());
scaleU.setEditor(new SpinnerEditor(scaleU));
mDefault.addEnableComponent(scaleU, false);
panel.add(scaleU, "w 40");
panel.add(scaleU, "w 50lp");
order.add(((SpinnerEditor) scaleU.getEditor()).getTextField());
panel.add(new JLabel("y:"));
@ -626,7 +627,7 @@ public class AppearancePanel extends JPanel {
TEXTURE_UNIT).getSpinnerModel());
scaleV.setEditor(new SpinnerEditor(scaleV));
mDefault.addEnableComponent(scaleV, false);
panel.add(scaleV, "wrap, w 40");
panel.add(scaleV, "wrap, w 50lp");
order.add(((SpinnerEditor) scaleV.getEditor()).getTextField());
// Shine
@ -651,14 +652,14 @@ public class AppearancePanel extends JPanel {
order.add(order.indexOf(colorButton) + 1, ((SpinnerEditor) spinShine.getEditor()).getTextField());
// Offset
panel.add(new JLabel(trans.get("AppearanceCfg.lbl.texture.offset")));
panel.add(new JLabel(trans.get("AppearanceCfg.lbl.texture.offset")), "gapleft para");
panel.add(new JLabel("x:"), "split 4");
JSpinner offsetU = new JSpinner(new DoubleModel(builder, "OffsetU",
TEXTURE_UNIT).getSpinnerModel());
offsetU.setEditor(new SpinnerEditor(offsetU));
mDefault.addEnableComponent(offsetU, false);
panel.add(offsetU, "w 40");
panel.add(offsetU, "w 50lp");
order.add(((SpinnerEditor) offsetU.getEditor()).getTextField());
panel.add(new JLabel("y:"));
@ -666,7 +667,7 @@ public class AppearancePanel extends JPanel {
TEXTURE_UNIT).getSpinnerModel());
offsetV.setEditor(new SpinnerEditor(offsetV));
mDefault.addEnableComponent(offsetV, false);
panel.add(offsetV, "wrap, w 40");
panel.add(offsetV, "wrap, w 50lp");
order.add(((SpinnerEditor) offsetV.getEditor()).getTextField());
// Opacity
@ -689,7 +690,7 @@ public class AppearancePanel extends JPanel {
((SpinnerEditor) spinOpacity.getEditor()).getTextField());
// Rotation
panel.add(new JLabel(trans.get("AppearanceCfg.lbl.texture.rotation")));
panel.add(new JLabel(trans.get("AppearanceCfg.lbl.texture.rotation")), "gapleft para");
DoubleModel rotationModel = new DoubleModel(builder, "Rotation",
UnitGroup.UNITS_ANGLE);
JSpinner rotation = new JSpinner(rotationModel.getSpinnerModel());
@ -701,10 +702,10 @@ public class AppearancePanel extends JPanel {
BasicSlider bs = new BasicSlider(rotationModel.getSliderModel(
-Math.PI, Math.PI));
mDefault.addEnableComponent(bs, false);
panel.add(bs, "w 50, wrap");
panel.add(bs, "w 100, wrap");
// Repeat
panel.add(new JLabel(trans.get("AppearanceCfg.lbl.texture.repeat")), "skip 2");
panel.add(new JLabel(trans.get("AppearanceCfg.lbl.texture.repeat")), "skip 2, gapleft para");
EdgeMode[] list = new EdgeMode[EdgeMode.values().length];
System.arraycopy(EdgeMode.values(), 0, list, 0,
EdgeMode.values().length);