TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-14 15:26:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some bugs, introduced by new undo-system.

Browse Source
This commit is contained in:
hneemann 2019-05-23 12:58:56 +02:00
parent d2785a9d9e
commit 25c30014de
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/de/neemann/digital/draw/elements/Circuit.java
View File

@ -215,7 +215,8 @@ public class Circuit implements Copyable<Circuit> {
*/ */
public Circuit createShallowCopy() { public Circuit createShallowCopy() {
Circuit circuit = new Circuit(); Circuit circuit = new Circuit();
circuit.attributes = new ElementAttributes(attributes); if (attributes != null)
circuit.attributes = new ElementAttributes(attributes);
circuit.wires.addAll(wires); circuit.wires.addAll(wires);
circuit.visualElements.addAll(visualElements); circuit.visualElements.addAll(visualElements);
return circuit; return circuit;

4
src/main/java/de/neemann/digital/gui/components/CircuitComponent.java
View File

@ -125,7 +125,7 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib
private AffineTransform transform = new AffineTransform(); private AffineTransform transform = new AffineTransform();
private Observer manualChangeObserver; private Observer manualChangeObserver;
private Vector lastMousePos; private Vector lastMousePos;
private SyncAccess modelSync; private SyncAccess modelSync = SyncAccess.NOSYNC;
private boolean isManualScale; private boolean isManualScale;
private boolean graphicsHasChanged = true; private boolean graphicsHasChanged = true;
private boolean focusWasLost = false; private boolean focusWasLost = false;
@ -264,6 +264,8 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib
addMouseMotionListener(dispatcher); addMouseMotionListener(dispatcher);
addMouseListener(dispatcher); addMouseListener(dispatcher);
mouseNormal.activate();
setToolTipText(""); setToolTipText("");
} }