From fb872fdb66d661b5e8b6f5b716aa1084d0aba0a8 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Mon, 28 Feb 2022 16:35:07 +0100 Subject: [PATCH 1/4] [fixes #1189] Fix Shine slider zero width --- .../net/sf/openrocket/gui/configdialog/AppearancePanel.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java b/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java index 308cdebe5..cd8e2d580 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java @@ -18,7 +18,6 @@ import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.JOptionPane; import javax.swing.JSpinner; -import javax.swing.JSlider; import javax.swing.JTabbedPane; import javax.swing.colorchooser.ColorSelectionModel; import javax.swing.event.ChangeEvent; @@ -553,7 +552,7 @@ public class AppearancePanel extends JPanel { UnitGroup.UNITS_RELATIVE); JSpinner spin = new JSpinner(shineModel.getSpinnerModel()); spin.setEditor(new SpinnerEditor(spin)); - JSlider slide = new JSlider(shineModel.getSliderModel(0, 1)); + BasicSlider slide = new BasicSlider(shineModel.getSliderModel(0, 1)); UnitSelector unit = new UnitSelector(shineModel); mDefault.addEnableComponent(slide, false); From 9be77d7a4ff1fca1abfa15dd9ca2ef50567995d8 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Mon, 28 Feb 2022 20:39:38 +0100 Subject: [PATCH 2/4] Clamp shine & opacity values --- .../net/sf/openrocket/gui/configdialog/AppearancePanel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java b/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java index eb683b4a3..db2a119b4 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java @@ -549,7 +549,7 @@ public class AppearancePanel extends JPanel { // Shine panel.add(new JLabel(trans.get("AppearanceCfg.lbl.shine"))); DoubleModel shineModel = new DoubleModel(builder, "Shine", - UnitGroup.UNITS_RELATIVE); + UnitGroup.UNITS_RELATIVE, 0, 1); JSpinner spin = new JSpinner(shineModel.getSpinnerModel()); spin.setEditor(new SpinnerEditor(spin)); BasicSlider slide = new BasicSlider(shineModel.getSliderModel(0, 1)); @@ -583,10 +583,10 @@ public class AppearancePanel extends JPanel { // Opacity panel.add(new JLabel(trans.get("AppearanceCfg.lbl.opacity"))); DoubleModel opacityModel = new DoubleModel(builder, "Opacity", - UnitGroup.UNITS_RELATIVE); + UnitGroup.UNITS_RELATIVE, 0, 1); JSpinner spinOpacity = new JSpinner(opacityModel.getSpinnerModel()); spinOpacity.setEditor(new SpinnerEditor(spinOpacity)); - JSlider slideOpacity = new JSlider(opacityModel.getSliderModel(0, 1)); + BasicSlider slideOpacity = new BasicSlider(opacityModel.getSliderModel(0, 1)); UnitSelector unitOpacity = new UnitSelector(opacityModel); mDefault.addEnableComponent(slideOpacity, false); From 125e8f82705b7c2e435a1442c58a5e7fcce12fb0 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Mon, 28 Feb 2022 20:40:48 +0100 Subject: [PATCH 3/4] Redo the changes from PR #970 I have no idea why the changes from that PR were gone, but... now they're back... --- .../net/sf/openrocket/gui/configdialog/AppearancePanel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java b/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java index db2a119b4..8a579f9d2 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java @@ -550,6 +550,9 @@ public class AppearancePanel extends JPanel { panel.add(new JLabel(trans.get("AppearanceCfg.lbl.shine"))); DoubleModel shineModel = new DoubleModel(builder, "Shine", UnitGroup.UNITS_RELATIVE, 0, 1); + // Set the initial value to the reset state, not the shine value of the default appearance of this component + if (mDefault.getValue() && previousUserSelectedAppearance != null) + shineModel.setValue(previousUserSelectedAppearance.getShine()); JSpinner spin = new JSpinner(shineModel.getSpinnerModel()); spin.setEditor(new SpinnerEditor(spin)); BasicSlider slide = new BasicSlider(shineModel.getSliderModel(0, 1)); From 161884bc1bfabeccb46f80203f589517fcd0835b Mon Sep 17 00:00:00 2001 From: SiboVG Date: Mon, 28 Feb 2022 21:10:40 +0100 Subject: [PATCH 4/4] Rename some stuff --- .../gui/configdialog/AppearancePanel.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java b/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java index 8a579f9d2..131a31ec9 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java @@ -553,18 +553,18 @@ public class AppearancePanel extends JPanel { // Set the initial value to the reset state, not the shine value of the default appearance of this component if (mDefault.getValue() && previousUserSelectedAppearance != null) shineModel.setValue(previousUserSelectedAppearance.getShine()); - JSpinner spin = new JSpinner(shineModel.getSpinnerModel()); - spin.setEditor(new SpinnerEditor(spin)); - BasicSlider slide = new BasicSlider(shineModel.getSliderModel(0, 1)); - UnitSelector unit = new UnitSelector(shineModel); + final JSpinner spinShine = new JSpinner(shineModel.getSpinnerModel()); + spinShine.setEditor(new SpinnerEditor(spinShine)); + final BasicSlider slideShine = new BasicSlider(shineModel.getSliderModel(0, 1)); + final UnitSelector unitShine = new UnitSelector(shineModel); - mDefault.addEnableComponent(slide, false); - mDefault.addEnableComponent(spin, false); - mDefault.addEnableComponent(unit, false); + mDefault.addEnableComponent(slideShine, false); + mDefault.addEnableComponent(spinShine, false); + mDefault.addEnableComponent(unitShine, false); - panel.add(spin, "split 3, w 50"); - panel.add(unit); - panel.add(slide, "w 50"); + panel.add(spinShine, "split 3, w 50"); + panel.add(unitShine); + panel.add(slideShine, "w 50"); // Offset panel.add(new JLabel(trans.get("AppearanceCfg.lbl.texture.offset")));