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

Merge pull request from SiboVG/issue-1189

Browse Source 
[fixes ] Fix Shine slider too small
This commit is contained in:
SiboVG 2022-02-28 23:56:05 +01:00 committed by GitHub
commit 6fe0a2bf5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 14 deletions

30
swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java

@ -18,7 +18,6 @@ import javax.swing.SwingConstants;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import javax.swing.JSpinner; import javax.swing.JSpinner;
import javax.swing.JSlider;
import javax.swing.JTabbedPane; import javax.swing.JTabbedPane;
import javax.swing.colorchooser.ColorSelectionModel; import javax.swing.colorchooser.ColorSelectionModel;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
@ -550,19 +549,22 @@ public class AppearancePanel extends JPanel {
// Shine // Shine
panel.add(new JLabel(trans.get("AppearanceCfg.lbl.shine"))); panel.add(new JLabel(trans.get("AppearanceCfg.lbl.shine")));
DoubleModel shineModel = new DoubleModel(builder, "Shine", DoubleModel shineModel = new DoubleModel(builder, "Shine",
UnitGroup.UNITS_RELATIVE); UnitGroup.UNITS_RELATIVE, 0, 1);
JSpinner spin = new JSpinner(shineModel.getSpinnerModel()); // Set the initial value to the reset state, not the shine value of the default appearance of this component
spin.setEditor(new SpinnerEditor(spin)); if (mDefault.getValue() && previousUserSelectedAppearance != null)
JSlider slide = new JSlider(shineModel.getSliderModel(0, 1)); shineModel.setValue(previousUserSelectedAppearance.getShine());
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(slideShine, false);
mDefault.addEnableComponent(spin, false); mDefault.addEnableComponent(spinShine, false);
mDefault.addEnableComponent(unit, false); mDefault.addEnableComponent(unitShine, false);
panel.add(spin, "split 3, w 50"); panel.add(spinShine, "split 3, w 50");
panel.add(unit); panel.add(unitShine);
panel.add(slide, "w 50"); panel.add(slideShine, "w 50");
// Offset // Offset
panel.add(new JLabel(trans.get("AppearanceCfg.lbl.texture.offset"))); panel.add(new JLabel(trans.get("AppearanceCfg.lbl.texture.offset")));
@ -584,10 +586,10 @@ public class AppearancePanel extends JPanel {
// Opacity // Opacity
panel.add(new JLabel(trans.get("AppearanceCfg.lbl.opacity"))); panel.add(new JLabel(trans.get("AppearanceCfg.lbl.opacity")));
DoubleModel opacityModel = new DoubleModel(builder, "Opacity", DoubleModel opacityModel = new DoubleModel(builder, "Opacity",
UnitGroup.UNITS_RELATIVE); UnitGroup.UNITS_RELATIVE, 0, 1);
JSpinner spinOpacity = new JSpinner(opacityModel.getSpinnerModel()); JSpinner spinOpacity = new JSpinner(opacityModel.getSpinnerModel());
spinOpacity.setEditor(new SpinnerEditor(spinOpacity)); 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); UnitSelector unitOpacity = new UnitSelector(opacityModel);
mDefault.addEnableComponent(slideOpacity, false); mDefault.addEnableComponent(slideOpacity, false);