From 25c30014dea9fb85a360caee4c6deb7522b6ba51 Mon Sep 17 00:00:00 2001 From: hneemann Date: Thu, 23 May 2019 12:58:56 +0200 Subject: [PATCH] Fixed some bugs, introduced by new undo-system. --- src/main/java/de/neemann/digital/draw/elements/Circuit.java | 3 ++- .../de/neemann/digital/gui/components/CircuitComponent.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/neemann/digital/draw/elements/Circuit.java b/src/main/java/de/neemann/digital/draw/elements/Circuit.java index eb222ee27..6d873d0b9 100644 --- a/src/main/java/de/neemann/digital/draw/elements/Circuit.java +++ b/src/main/java/de/neemann/digital/draw/elements/Circuit.java @@ -215,7 +215,8 @@ public class Circuit implements Copyable { */ public Circuit createShallowCopy() { Circuit circuit = new Circuit(); - circuit.attributes = new ElementAttributes(attributes); + if (attributes != null) + circuit.attributes = new ElementAttributes(attributes); circuit.wires.addAll(wires); circuit.visualElements.addAll(visualElements); return circuit; diff --git a/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java b/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java index 58b787164..826c25222 100644 --- a/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java +++ b/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java @@ -125,7 +125,7 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib private AffineTransform transform = new AffineTransform(); private Observer manualChangeObserver; private Vector lastMousePos; - private SyncAccess modelSync; + private SyncAccess modelSync = SyncAccess.NOSYNC; private boolean isManualScale; private boolean graphicsHasChanged = true; private boolean focusWasLost = false; @@ -264,6 +264,8 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib addMouseMotionListener(dispatcher); addMouseListener(dispatcher); + mouseNormal.activate(); + setToolTipText(""); }