From f4a85993e60c8989e53c4af79d3f46e820d1c59d Mon Sep 17 00:00:00 2001 From: bkuker Date: Mon, 17 Dec 2012 12:09:56 -0500 Subject: [PATCH] Disable color choice when you have a texture selected. --- .../openrocket/gui/configdialog/AppearancePanel.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/core/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java b/core/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java index c2371e99a..bd6dc9f20 100644 --- a/core/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java +++ b/core/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java @@ -121,7 +121,7 @@ public class AppearancePanel extends JPanel { } final JButton figureColorButton = new JButton(new ColorIcon(figureColor)); - final JButton colorButton = new JButton(new ColorIcon(ab.getAmbient())); + final JButton colorButton = new JButton(new ColorIcon(ab.getColor())); final JComboBox textureDropDown = new JComboBox( new DecalModel(this,document,ab));; @@ -238,8 +238,15 @@ public class AppearancePanel extends JPanel { { // Color add(new JLabel(trans.get("AppearanceCfg.lbl.color.Color"))); - mDefault.addEnableComponent(colorButton, false); + //mDefault.addEnableComponent(colorButton, false); + colorButton.setEnabled(ab.getImage() == null); add(colorButton); + ab.addChangeListener(new StateChangeListener() { + @Override + public void stateChanged(EventObject e) { + colorButton.setEnabled(ab.getImage() == null); + } + }); } { // Scale