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

Fix decal selection for multi-comp

Browse Source
This commit is contained in:
SiboVG 2022-06-15 18:08:06 +02:00
parent 4b614ff11a
commit 05a033dee4
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java
View File

@ -496,6 +496,20 @@ public class AppearancePanel extends JPanel implements WindowListener {
DecalModel decalModel = new DecalModel(panel, document, builder); DecalModel decalModel = new DecalModel(panel, document, builder);
JComboBox<DecalImage> textureDropDown = new JComboBox<DecalImage>(decalModel); JComboBox<DecalImage> textureDropDown = new JComboBox<DecalImage>(decalModel);
// We need to add this action listener that triggers a decalModel update when the same item is selected, because
// for multi-comp edits, the listeners' decals may not be updated otherwise
textureDropDown.addActionListener(new ActionListener() {
private DecalImage previousSelection = (DecalImage) decalModel.getSelectedItem();
@Override
public void actionPerformed(ActionEvent e) {
DecalImage decal = (DecalImage) textureDropDown.getSelectedItem();
if (decal == previousSelection) {
decalModel.setSelectedItem(decal);
}
previousSelection = decal;
}
});
JButton colorButton = new SelectColorButton(new ColorIcon(builder.getPaint())); JButton colorButton = new SelectColorButton(new ColorIcon(builder.getPaint()));
colorButton.addActionListener(new ColorActionListener(builder, "Paint")); colorButton.addActionListener(new ColorActionListener(builder, "Paint"));