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

Merge pull request #129 from kruland2607/fixdecaldropdown

Browse Source 
Fix for issue #116
This commit is contained in:
kruland2607 2013-09-03 18:54:24 -07:00
commit 5239123f6c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/net/sf/openrocket/gui/adaptors/DecalModel.java
View File

@ -46,7 +46,7 @@ public class DecalModel extends AbstractListModel implements ComboBoxModel {
@Override @Override
public Object getElementAt(int index) { public Object getElementAt(int index) {
if (index == 0) { if (index <= 0) {
return NONE_SELECTED; return NONE_SELECTED;
} }
if (index == getSize() - 1) { if (index == getSize() - 1) {
@ -93,4 +93,8 @@ public class DecalModel extends AbstractListModel implements ComboBoxModel {
} }
} }
public void refresh() {
decals = document.getDecalList().toArray(new DecalImage[0]);
fireContentsChanged(this, 0, decals.length);
}
} }

4
core/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java
View File

@ -145,7 +145,8 @@ public class AppearancePanel extends JPanel {
final JButton colorButton = new JButton(new ColorIcon(ab.getPaint())); final JButton colorButton = new JButton(new ColorIcon(ab.getPaint()));
final JComboBox textureDropDown = new JComboBox(new DecalModel(this, document, ab)); final DecalModel decalModel = new DecalModel(this, document, ab);
final JComboBox textureDropDown = new JComboBox(decalModel);
ab.addChangeListener(new StateChangeListener() { ab.addChangeListener(new StateChangeListener() {
@Override @Override
@ -153,6 +154,7 @@ public class AppearancePanel extends JPanel {
figureColorButton.setIcon(new ColorIcon(c.getColor())); figureColorButton.setIcon(new ColorIcon(c.getColor()));
colorButton.setIcon(new ColorIcon(ab.getPaint())); colorButton.setIcon(new ColorIcon(ab.getPaint()));
c.setAppearance(ab.getAppearance()); c.setAppearance(ab.getAppearance());
decalModel.refresh();
} }
}); });