Merge pull request #18 from Nielswps/labelDragFix

Dragging tags outside of component fixed
DEIS-Tools · Jul 20, 2020 · ec5fdf9 · ec5fdf9
2 parents 27c7b4f + c87115b
commit ec5fdf9
Showing 1 changed file with 29 additions and 0 deletions.
diff --git a/src/main/java/dk/cs/aau/huppaal/presentations/TagPresentation.java b/src/main/java/dk/cs/aau/huppaal/presentations/TagPresentation.java
@@ -1,6 +1,7 @@
 package dk.cs.aau.huppaal.presentations;
 
 import dk.cs.aau.huppaal.abstractions.Component;
+import dk.cs.aau.huppaal.abstractions.Nail;
 import dk.cs.aau.huppaal.controllers.CanvasController;
 import dk.cs.aau.huppaal.utility.UndoRedoStack;
 import dk.cs.aau.huppaal.utility.colors.Color;
@@ -9,13 +10,16 @@
 import javafx.application.Platform;
 import javafx.beans.binding.When;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.StringProperty;
 import javafx.beans.value.ObservableBooleanValue;
+import javafx.beans.value.ObservableDoubleValue;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.JavaFXBuilderFactory;
 import javafx.geometry.Insets;
 import javafx.scene.Cursor;
+import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.layout.StackPane;
 import javafx.scene.shape.LineTo;
@@ -212,6 +216,31 @@ private void initializeShape() {
                 textField.requestFocus(); // This needs to be done twice because of reasons
             }
 
+            Node parent;
+
+            if(getParent() instanceof NailPresentation){
+                //Get the correct parent for guards, selects, synchronizations, and updates
+                parent = getParent();
+            } else {
+                //Gte the correct parent for location names
+                parent = getParent().getParent();
+            }
+
+            //Handle the horizontal placement of the tag
+            if(parent.localToParent(getBoundsInParent()).getCenterX() > getComponent().widthProperty().doubleValue() - textField.getWidth()) {
+                setTranslateX(getTranslateX() + getComponent().widthProperty().doubleValue() - textField.getWidth() - parent.localToParent(getBoundsInParent()).getCenterX());
+            } else if (parent.localToParent(getBoundsInParent()).getCenterX() - textField.getWidth() < 0) {
+                setTranslateX(getTranslateX() - (parent.localToParent(getBoundsInParent()).getCenterX() - textField.getWidth()));
+            }
+
+            //Handle the vertical placement of the tag
+            if(parent.localToParent(getBoundsInParent()).getCenterY() > getComponent().heightProperty().doubleValue() - textField.getHeight()) {
+                setTranslateY(getTranslateY() + getComponent().heightProperty().doubleValue() - textField.getHeight() - parent.localToParent(getBoundsInParent()).getCenterY());
+            } else if (parent.localToParent(getBoundsInParent()).getCenterY() - textField.getHeight() - GRID_SIZE * 2 < 0) {
+                setTranslateY(getTranslateY() - (parent.localToParent(getBoundsInParent()).getCenterY() - textField.getHeight() - GRID_SIZE * 2));
+            }
+
+
         });
 
         textField.focusedProperty().addListener((observable, oldValue, newValue) -> {