Canvas: fix translation with stepping.

Author: PhaserEditor2D

source/phasereditor/phasereditor.canvas.ui/src/phasereditor/canvas/ui/editors/behaviors/DragBehavior.java

@@ -161,17 +161,19 @@ void handleMouseDragged(MouseEvent event) {
 			Point2D p = null;
 
 			if (axis == Axis.CENTER) {
-
-				p = _canvas.getDragBehavior().adjustPositionToStep(info.initX + dx, info.initY + dy);
+				
+				p = new Point2D(info.initX + dx, info.initY + dy);
 
 			} else {
 
 				if (axis.changeW()) {
-					p = _canvas.getDragBehavior().adjustPositionToStep(info.initX + dx, info.initY);
+					//p = _canvas.getDragBehavior().adjustPositionToStep(info.initX + dx, info.initY);
+					p = new Point2D(info.initX + dx, info.initY);
 				}
 
 				if (axis.changeH()) {
-					p = _canvas.getDragBehavior().adjustPositionToStep(info.initX, info.initY + dy);
+					// p = _canvas.getDragBehavior().adjustPositionToStep(info.initX, info.initY + dy);
+					p = new Point2D(info.initX, info.initY + dy);
 				}
 			}
 
@@ -182,6 +184,8 @@ void handleMouseDragged(MouseEvent event) {
 
 			BaseObjectModel model = info.getModel();
 
+			p = _canvas.getDragBehavior().adjustPositionToStep(p.getX(), p.getY());
+			
 			model.setX(p.getX());
 			model.setY(p.getY());
 

source/phasereditor/phasereditor.canvas.ui/src/phasereditor/canvas/ui/editors/edithandlers/MoveHandlerNode.java

@@ -53,18 +53,16 @@ public MoveHandlerNode(Axis axis, IObjectNode object) {
 		super(object);
 
 		_axis = axis;
-		
+
 		setStroke(Color.BLACK);
 		setStrokeWidth(0.5);
 
 		setCursor(Cursor.MOVE);
 
-		Paint color = _axis == Axis.CENTER ? Color.BLUE
-				: (_axis.changeW() ? Color.RED.brighter() : Color.LIGHTGREEN);
+		Paint color = _axis == Axis.CENTER ? Color.BLUE : (_axis.changeW() ? Color.RED.brighter() : Color.LIGHTGREEN);
 
 		setFill(color);
 
-		
 		updateHandler();
 
 	}
@@ -86,7 +84,7 @@ public void handleSceneDrag(double dx, double dy, MouseEvent e) {
 
 		if (isLocalCoords() && _axis != Axis.CENTER) {
 
-			p = _canvas.getDragBehavior().adjustPositionToStep(_initX + dx, _initY + dy);
+			p = new Point2D(_initX + dx, _initY + dy);
 
 			Point2D vector;
 
@@ -113,30 +111,35 @@ public void handleSceneDrag(double dx, double dy, MouseEvent e) {
 
 			vector = vector.multiply(d);
 
-			_model.setX(_initModelX + vector.getX());
-			_model.setY(_initModelY + vector.getY());
+			p = _canvas.getDragBehavior().adjustPositionToStep(_initModelX + vector.getX(),
+					_initModelY + vector.getY());
+
+			_model.setX(p.getX());
+			_model.setY(p.getY());
 
 		} else {
 
 			if (_axis == Axis.CENTER) {
 
-				p = _canvas.getDragBehavior().adjustPositionToStep(_initX + dx, _initY + dy);
+				p = new Point2D(_initX + dx, _initY + dy);
 
 			} else {
 
 				if (_axis.changeW()) {
-					p = _canvas.getDragBehavior().adjustPositionToStep(_initX + dx, _initY);
+					p = new Point2D(_initX + dx, _initY);
 				}
 
 				if (_axis.changeH()) {
-					p = _canvas.getDragBehavior().adjustPositionToStep(_initX, _initY + dy);
+					p = new Point2D(_initX, _initY + dy);
 				}
 			}
-
+			
 			Node node = _object.getNode();
 			Parent parent = node.getParent();
 			p = parent.sceneToLocal(p);
 
+			p = _canvas.getDragBehavior().adjustPositionToStep(p.getX(), p.getY());
+			
 			_model.setX(p.getX());
 			_model.setY(p.getY());
 		}