From dbf36b9bda3e05ceedbaa8ea27a0328fe3fe4cec Mon Sep 17 00:00:00 2001 From: hneemann Date: Sat, 11 Jun 2016 11:52:32 +0200 Subject: [PATCH] reordered menu entries --- src/main/java/de/neemann/digital/gui/Main.java | 6 +++--- .../de/neemann/digital/gui/components/CircuitComponent.java | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/neemann/digital/gui/Main.java b/src/main/java/de/neemann/digital/gui/Main.java index 439157812..b9107ce11 100644 --- a/src/main/java/de/neemann/digital/gui/Main.java +++ b/src/main/java/de/neemann/digital/gui/Main.java @@ -397,14 +397,14 @@ public class Main extends JFrame implements ClosingWindowListener.ConfirmSave, E edit.add(editAttributes.createJMenuItem()); edit.addSeparator(); - edit.add(circuitComponent.getCopyAction()); - edit.add(circuitComponent.getPasteAction()); - edit.addSeparator(); edit.add(elementStateAction.createJMenuItem()); edit.add(orderInputs.createJMenuItem()); edit.add(orderOutputs.createJMenuItem()); edit.add(orderMeasurements.createJMenuItem()); edit.addSeparator(); + edit.add(circuitComponent.getCopyAction()); + edit.add(circuitComponent.getPasteAction()); + edit.addSeparator(); edit.add(editSettings.createJMenuItem()); } 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 046d9aea5..7bbccc3c7 100644 --- a/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java +++ b/src/main/java/de/neemann/digital/gui/components/CircuitComponent.java @@ -451,6 +451,12 @@ public class CircuitComponent extends JComponent { activeMouseController.moved(e); } + @Override + public void mouseEntered(MouseEvent e) { + lastMousePos = new Vector(e.getX(), e.getY()); + activeMouseController.moved(e); + } + @Override public void mouseDragged(MouseEvent e) { if (wasMoved(e) || isMoved) {