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

If in wire draw mode a wire is clicked with CTRL down the wire move mode is activated.

Browse Source
This commit is contained in:
hneemann 2017-05-27 23:23:17 +02:00
parent 37de39ad8a
commit 6fecb0e4b9
1 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1261,14 +1261,21 @@ public class CircuitComponent extends JComponent implements Circuit.ChangedListe
@Override
void clicked(MouseEvent e) {
if (e.getButton() == MouseEvent.BUTTON3)
mouseNormal.activate();
else {
modify(new ModifyInsertWire(wire).checkIfLenZero());
if (circuit.isPinPos(wire.p2))
if (e.isControlDown()) {
Vector pos = raster(getPosVector(e));
Wire wire = circuit.getWireAt(pos, SIZE2);
if (wire != null)
mouseMoveWire.activate(wire, pos);
} else {
if (e.getButton() == MouseEvent.BUTTON3)
mouseNormal.activate();
else
mouseWireRect.activate(wire.p2);
else {
modify(new ModifyInsertWire(wire).checkIfLenZero());
if (circuit.isPinPos(wire.p2))
mouseNormal.activate();
else
mouseWireRect.activate(wire.p2);
}
}
}
@ -1332,20 +1339,27 @@ public class CircuitComponent extends JComponent implements Circuit.ChangedListe
@Override
void clicked(MouseEvent e) {
if (e.getButton() == MouseEvent.BUTTON3)
mouseNormal.activate();
else {
modify(new Modifications.Builder()
.add(new ModifyInsertWire(wire1).checkIfLenZero())
.add(new ModifyInsertWire(wire2).checkIfLenZero())
.build());
if (circuit.isPinPos(wire2.p2))
if (e.isControlDown()) {
Vector pos = raster(getPosVector(e));
Wire wire = circuit.getWireAt(pos, SIZE2);
if (wire != null)
mouseMoveWire.activate(wire, pos);
} else {
if (e.getButton() == MouseEvent.BUTTON3)
mouseNormal.activate();
else {
initialPos = wire2.p2;
selectionMade = false;
wire1 = new Wire(wire2.p2, wire2.p2);
wire2 = new Wire(wire2.p2, wire2.p2);
modify(new Modifications.Builder()
.add(new ModifyInsertWire(wire1).checkIfLenZero())
.add(new ModifyInsertWire(wire2).checkIfLenZero())
.build());
if (circuit.isPinPos(wire2.p2))
mouseNormal.activate();
else {
initialPos = wire2.p2;
selectionMade = false;
wire1 = new Wire(wire2.p2, wire2.p2);
wire2 = new Wire(wire2.p2, wire2.p2);
}
}
}
}