From 0550c2995c5db6438373d13d1005ba52c91afc3f Mon Sep 17 00:00:00 2001 From: SiboVG Date: Thu, 30 Mar 2023 01:52:20 +0200 Subject: [PATCH] Disable sky color opacity widgets when sky image selected --- .../gui/figure3d/photo/PhotoSettingsConfig.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoSettingsConfig.java b/swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoSettingsConfig.java index e78e18087..e66251414 100644 --- a/swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoSettingsConfig.java +++ b/swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoSettingsConfig.java @@ -272,9 +272,12 @@ public class PhotoSettingsConfig extends JTabbedPane { /// Sky color opacity add(new JLabel(trans.get("PhotoSettingsConfig.lbl.skyColorOpacity"))); DoubleModel skyColorOpacityModel = new DoubleModel(p, "SkyColorOpacity", UnitGroup.UNITS_RELATIVE, 0, 1); - add(new EditableSpinner(skyColorOpacityModel.getSpinnerModel()), "growx, split 2"); - add(new UnitSelector(skyColorOpacityModel)); - add(new BasicSlider(skyColorOpacityModel.getSliderModel()), "wrap"); + EditableSpinner skyColorOpacitySpinner = new EditableSpinner(skyColorOpacityModel.getSpinnerModel()); + add(skyColorOpacitySpinner, "growx, split 2"); + UnitSelector skyColorOpacityUnitSelector = new UnitSelector(skyColorOpacityModel); + add(skyColorOpacityUnitSelector); + BasicSlider skyColorOpacitySlider = new BasicSlider(skyColorOpacityModel.getSliderModel()); + add(skyColorOpacitySlider, "wrap"); p.addChangeListener(skyColorOpacityModel); /// Sky image @@ -301,9 +304,15 @@ public class PhotoSettingsConfig extends JTabbedPane { if (s instanceof Sky && s != noSky) { p.setSky((Sky) s); skyColorButton.setEnabled(false); + skyColorOpacitySpinner.setEnabled(false); + skyColorOpacityUnitSelector.setEnabled(false); + skyColorOpacitySlider.setEnabled(false); } else if (s == noSky) { p.setSky(null); skyColorButton.setEnabled(true); + skyColorOpacitySpinner.setEnabled(true); + skyColorOpacityUnitSelector.setEnabled(true); + skyColorOpacitySlider.setEnabled(true); } } });