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

[#1326] Update opacity slider with color button alpha change

Browse Source
This commit is contained in:
SiboVG 2022-05-10 02:22:04 +02:00
parent 5b49275ac5
commit 938fc2436e
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -446,18 +446,6 @@ public class AppearancePanel extends JPanel {
JButton colorButton = new SelectColorButton(new ColorIcon(builder.getPaint())); JButton colorButton = new SelectColorButton(new ColorIcon(builder.getPaint()));
builder.addChangeListener(new StateChangeListener() {
@Override
public void stateChanged(EventObject e) {
colorButton.setIcon(new ColorIcon(builder.getPaint()));
if (!insideBuilder)
c.setAppearance(builder.getAppearance());
else
((InsideColorComponent)c).getInsideColorComponentHandler().setInsideAppearance(builder.getAppearance());
decalModel.refresh();
}
});
colorButton.addActionListener(new ColorActionListener(builder, "Paint")); colorButton.addActionListener(new ColorActionListener(builder, "Paint"));
// Texture Header Row // Texture Header Row
@ -623,5 +611,22 @@ public class AppearancePanel extends JPanel {
"EdgeMode", list)); "EdgeMode", list));
mDefault.addEnableComponent(combo, false); mDefault.addEnableComponent(combo, false);
panel.add(combo, "wrap"); panel.add(combo, "wrap");
builder.addChangeListener(new StateChangeListener() {
double lastOpacity = builder.getOpacity();
@Override
public void stateChanged(EventObject e) {
colorButton.setIcon(new ColorIcon(builder.getPaint()));
if (lastOpacity != builder.getOpacity()) {
opacityModel.stateChanged(null);
lastOpacity = builder.getOpacity();
}
if (!insideBuilder)
c.setAppearance(builder.getAppearance());
else
((InsideColorComponent)c).getInsideColorComponentHandler().setInsideAppearance(builder.getAppearance());
decalModel.refresh();
}
});
} }
} }