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

fixes #262

Browse Source
This commit is contained in:
hneemann 2019-03-17 18:38:27 +01:00
parent 346b7c4ca6
commit 1b8f5ae933
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2181,7 +2181,7 @@ public class CircuitComponent extends JComponent implements Circuit.ChangedListe
private final class MouseControllerRun extends MouseController {
private boolean dragHandled;
private VisualElement draggedElement;
private MouseControllerRun(Cursor cursor) {
super(cursor);
@ -2192,9 +2192,9 @@ public class CircuitComponent extends JComponent implements Circuit.ChangedListe
VisualElement ve = getInteractiveElementAt(e);
if (ve != null) {
interact(e, ve::elementPressed);
dragHandled = true;
draggedElement = ve;
} else
dragHandled = false;
draggedElement = null;
}
private VisualElement getInteractiveElementAt(MouseEvent e) {
@ -2208,9 +2208,10 @@ public class CircuitComponent extends JComponent implements Circuit.ChangedListe
@Override
void released(MouseEvent e) {
VisualElement ve = getInteractiveElementAt(e);
if (ve != null)
interact(e, ve::elementReleased);
if (draggedElement != null) {
interact(e, draggedElement::elementReleased);
draggedElement = null;
}
}
@Override
@ -2222,10 +2223,11 @@ public class CircuitComponent extends JComponent implements Circuit.ChangedListe
@Override
boolean dragged(MouseEvent e) {
VisualElement ve = getInteractiveElementAt(e);
if (ve != null)
interact(e, ve::elementDragged);
return dragHandled;
if (draggedElement != null) {
interact(e, draggedElement::elementDragged);
return true;
} else
return false;
}
private void interact(MouseEvent e, Actor actor) {