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

Don't clear config listeners on document undo

Browse Source
This commit is contained in:
SiboVG 2023-01-08 23:36:06 +01:00
parent 7ea17b01d2
commit b2d19181b1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swing/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java
View File

@ -46,7 +46,7 @@ public class ComponentConfigDialog extends JDialog implements ComponentChangeLis
private RocketComponentConfig configurator = null; private RocketComponentConfig configurator = null;
private boolean isModified = false; private boolean isModified = false;
private final boolean isNewComponent; private final boolean isNewComponent;
protected static boolean clearConfigListeners = true; public static boolean clearConfigListeners = true;
private static String previousSelectedTab = null; // Name of the previous selected tab private static String previousSelectedTab = null; // Name of the previous selected tab

2
swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java
View File

@ -277,6 +277,7 @@ public class RocketComponentConfig extends JPanel {
@Override @Override
public void actionPerformed(ActionEvent arg0) { public void actionPerformed(ActionEvent arg0) {
if (preferences.getBoolean(IGNORE_DISCARD_EDITING_WARNING, false)) { if (preferences.getBoolean(IGNORE_DISCARD_EDITING_WARNING, false)) {
ComponentConfigDialog.clearConfigListeners = false; // Undo action => config listeners of new component will be cleared
ComponentConfigDialog.disposeDialog(); ComponentConfigDialog.disposeDialog();
document.undo(); document.undo();
return; return;
@ -291,6 +292,7 @@ public class RocketComponentConfig extends JPanel {
int resultYesNo = JOptionPane.showConfirmDialog(RocketComponentConfig.this, msg, int resultYesNo = JOptionPane.showConfirmDialog(RocketComponentConfig.this, msg,
trans.get("RocketCompCfg.CancelOperation.title"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE); trans.get("RocketCompCfg.CancelOperation.title"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
if (resultYesNo == JOptionPane.YES_OPTION) { if (resultYesNo == JOptionPane.YES_OPTION) {
ComponentConfigDialog.clearConfigListeners = false; // Undo action => config listeners of new component will be cleared
ComponentConfigDialog.disposeDialog(); ComponentConfigDialog.disposeDialog();
document.undo(); document.undo();
} }