diff --git a/src/main/java/gui/VennMakerView.java b/src/main/java/gui/VennMakerView.java index 2adb622..9035e6a 100644 --- a/src/main/java/gui/VennMakerView.java +++ b/src/main/java/gui/VennMakerView.java @@ -339,6 +339,16 @@ public RelationVector(Point end, Relation r, Point start) */ private Cursor cursorMovable = new Cursor(Cursor.MOVE_CURSOR); + /** + * To identify if one button for adding actors or relations is selected + * + */ + public enum ButtonSelected { + ACTOR, RELATION + }; + + private ButtonSelected buttonSelectedType = ButtonSelected.ACTOR; + /** * Erzeugt eine neue Zeichenfläche fuer das angegebene Netzwerkobjekt. * Aenderungen am Modell fuehren nicht zu einem Neuzeichnen der @@ -4358,6 +4368,7 @@ public void action(MenuEvent e) Cursor c = toolkit.createCustomCursor(image, new Point(16, 16), "img"); this.cursorDefault = c; + this.setButtonSelectedType(ButtonSelected.ACTOR); useDefaultCursor(); } } @@ -4373,6 +4384,7 @@ public void action(MenuEvent e) Cursor c = toolkit.createCustomCursor(image, new Point(16, 16), "img"); this.cursorDefault = c; + this.setButtonSelectedType(ButtonSelected.RELATION); useDefaultCursor(); } } @@ -4428,4 +4440,12 @@ public void setDefaultCursor(Cursor c) { public void setMovableCursor(Cursor c) { this.cursorMovable = c; } + + public ButtonSelected getButtonSelectedType() { + return buttonSelectedType; + } + + public void setButtonSelectedType(ButtonSelected buttonSelectedType) { + this.buttonSelectedType = buttonSelectedType; + } } diff --git a/src/main/java/gui/VennMakerViewMouseContext.java b/src/main/java/gui/VennMakerViewMouseContext.java index 47b3131..7278f46 100644 --- a/src/main/java/gui/VennMakerViewMouseContext.java +++ b/src/main/java/gui/VennMakerViewMouseContext.java @@ -1,6 +1,7 @@ package gui; import gui.VennMaker.ViewMode; +import gui.VennMakerView.ButtonSelected; import java.awt.Cursor; import java.awt.Point; @@ -180,7 +181,7 @@ public void mouseMoved(final MouseEvent e) if (akteur != null && akteur != tooltipAkteur) { - if (isActorDraggable(akteur)) + if (isActorDraggable(akteur) && view.getButtonSelectedType() == ButtonSelected.ACTOR) ((VennMakerView)e.getSource()).useMovableCursor(); // neuer Tooltip koennte bald kommen if (akteur != lastHoverAkteur)