Captain-Chaos
/
WorldPainter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug fix: make undo work properly again for multiple dimensions

master
Captain Chaos 2022-08-27 18:34:52 +02:00
parent 4447361401
commit 60d4a6ceef
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
WorldPainter/WPGUI/src/main/java/org/pepsoft/worldpainter/App.java
View File

@ -510,7 +510,7 @@ public final class App extends JFrame implements RadiusControl,
view.moveTo(dimension.getLastViewPosition());
configureForPlatform();
currentUndoManager = undoManagers.get(anchor.dim);
currentUndoManager = undoManagers.get(anchor);
if (currentUndoManager == null) {
if ((! "true".equals(System.getProperty("org.pepsoft.worldpainter.disableUndo"))) && config.isUndoEnabled()) {
currentUndoManager = new UndoManager(ACTION_UNDO, ACTION_REDO, Math.max(config.getUndoLevels() + 1, 2));
@ -522,9 +522,9 @@ public final class App extends JFrame implements RadiusControl,
ACTION_REDO.setEnabled(false);
}
currentUndoManager.setStopAtClasses(PropertyChangeListener.class, Tile.Listener.class, Biome.class, BetterAction.class);
undoManagers.put(anchor.dim, currentUndoManager);
undoManagers.put(anchor, currentUndoManager);
dimension.register(currentUndoManager);
} else if ((!"true".equals(System.getProperty("org.pepsoft.worldpainter.disableUndo"))) && config.isUndoEnabled()) {
} else if ((! "true".equals(System.getProperty("org.pepsoft.worldpainter.disableUndo"))) && config.isUndoEnabled()) {
currentUndoManager.registerActions(ACTION_UNDO, ACTION_REDO);
}
dimension.armSavePoint();
@ -7016,7 +7016,7 @@ public final class App extends JFrame implements RadiusControl,
private final Map<Brush, JToggleButton> brushButtons = new HashMap<>();
private boolean programmaticChange;
private UndoManager currentUndoManager;
private final Map<Integer, UndoManager> undoManagers = new HashMap<>();
private final Map<Anchor, UndoManager> undoManagers = new HashMap<>();
private JSlider levelSlider, brushRotationSlider;
private float level = 0.51f, toolLevel = 0.51f;
private Set<Layer> hiddenLayers = new HashSet<>();