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

Merge pull request #1442 from SiboVG/issue-1244

Browse Source 
[#1244] Reset component appearance after reset to default
This commit is contained in:
SiboVG 2022-06-14 21:08:22 +02:00 committed by GitHub
commit f194562c78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -432,12 +432,12 @@ public class AppearancePanel extends JPanel {
BooleanModel mDefault; BooleanModel mDefault;
if (!insideBuilder) { if (!insideBuilder) {
builder = ab; builder = ab;
mDefault = new BooleanModel(c.getAppearance() == null); mDefault = new BooleanModel(c.getAppearance() == null || defaultAppearance.equals(c.getAppearance()));
} }
else if (c instanceof InsideColorComponent) { else if (c instanceof InsideColorComponent) {
builder = insideAb; builder = insideAb;
mDefault = new BooleanModel( Appearance appearance = ((InsideColorComponent)c).getInsideColorComponentHandler().getInsideAppearance();
((InsideColorComponent)c).getInsideColorComponentHandler().getInsideAppearance() == null); mDefault = new BooleanModel(appearance == null || defaultAppearance.equals(appearance));
} }
else return; else return;
@ -465,6 +465,7 @@ public class AppearancePanel extends JPanel {
: builder.getAppearance(); : builder.getAppearance();
} }
builder.setAppearance(defaultAppearance); builder.setAppearance(defaultAppearance);
c.setAppearance(null);
} else { } else {
if (!insideBuilder) if (!insideBuilder)
builder.setAppearance(previousUserSelectedAppearance); builder.setAppearance(previousUserSelectedAppearance);