Canvas: improve selection box painting.

Author: PhaserEditor2D

source/phasereditor/phasereditor.canvas.ui/src/phasereditor/canvas/ui/editors/SelectionBoxNode.java

@@ -21,45 +21,32 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 package phasereditor.canvas.ui.editors;
 
-import java.util.Arrays;
-import java.util.List;
-
+import javafx.geometry.Insets;
 import javafx.geometry.Point2D;
+import javafx.scene.effect.DropShadow;
+import javafx.scene.layout.Background;
+import javafx.scene.layout.BackgroundFill;
 import javafx.scene.layout.Border;
 import javafx.scene.layout.BorderStroke;
 import javafx.scene.layout.BorderStrokeStyle;
 import javafx.scene.layout.BorderWidths;
+import javafx.scene.layout.CornerRadii;
 import javafx.scene.layout.Pane;
 import javafx.scene.paint.Color;
-import javafx.scene.shape.StrokeLineCap;
-import javafx.scene.shape.StrokeLineJoin;
-import javafx.scene.shape.StrokeType;
 
 /**
  * @author arian
  *
  */
 public class SelectionBoxNode extends Pane {
 
-	private static Border _border;
-
-	static {
-		BorderWidths bw = new BorderWidths(1);
-		@SuppressWarnings("boxing")
-		List<Double> dashed = Arrays.asList(5d, 2d);
-		BorderStrokeStyle style1 = new BorderStrokeStyle(StrokeType.INSIDE, StrokeLineJoin.MITER, StrokeLineCap.BUTT,
-				10, 10, dashed);
-		BorderStrokeStyle style2 = new BorderStrokeStyle(StrokeType.INSIDE, StrokeLineJoin.MITER, StrokeLineCap.BUTT,
-				10, 0, dashed);
-
-		BorderStroke s1 = new BorderStroke(Color.WHITE, style1, null, bw);
-		BorderStroke s2 = new BorderStroke(Color.BLACK, style2, null, bw);
-
-		_border = new Border(s1, s2);
-	}
-
 	public SelectionBoxNode() {
-		setBorder(_border);
+		// setBorder(_border);
+		setEffect(new DropShadow());
+		Color c = Color.GREENYELLOW;
+		setBorder(new Border(new BorderStroke(c, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, new BorderWidths(2))));
+		setBackground(new Background(new BackgroundFill(new Color(c.getRed(), c.getGreen(), c.getBlue(), 0.1),
+				CornerRadii.EMPTY, Insets.EMPTY)));
 	}
 
 	public void setBox(Point2D start, Point2D end) {

source/phasereditor/phasereditor.canvas.ui/src/phasereditor/canvas/ui/editors/SelectionNode.java

@@ -23,6 +23,7 @@
 
 import javafx.geometry.Bounds;
 import javafx.geometry.Point2D;
+import javafx.scene.control.Label;
 import javafx.scene.effect.DropShadow;
 import javafx.scene.layout.Border;
 import javafx.scene.layout.BorderStroke;
@@ -31,6 +32,7 @@
 import javafx.scene.layout.CornerRadii;
 import javafx.scene.layout.Pane;
 import javafx.scene.paint.Color;
+import phasereditor.canvas.core.GroupModel;
 import phasereditor.canvas.ui.shapes.IObjectNode;
 
 /**
@@ -63,17 +65,25 @@ public class SelectionNode extends Pane {
 	private IObjectNode _objectNode;
 	protected Bounds _rect;
 	private ObjectCanvas _canvas;
+	private Label _label;
 
 	public SelectionNode(ObjectCanvas canvas, IObjectNode inode, Bounds rect) {
 		_objectNode = inode;
 		_rect = rect;
 		_canvas = canvas;
+		
+		_label = new Label(inode.getModel().getEditorName());
+		_label.setTextFill(Color.WHITE);
+		_label.setEffect(new DropShadow());
+		_label.relocate(0, -20);
+		
+		getChildren().add(_label);
 
 		updateFromZoomAndPanVariables();
 
-		//setBorder(inode.getModel() instanceof GroupModel ? _borderGroup : _borderSprite);
 		setEffect(new DropShadow());
-		setBorder(new Border(new BorderStroke(Color.GREENYELLOW, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, new BorderWidths(2))));
+		Color color = inode.getModel() instanceof GroupModel ? Color.LIGHTGREEN: Color.GREENYELLOW;
+		setBorder(new Border(new BorderStroke(color, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, new BorderWidths(2))));
 	}
 
 	public static final int HANDLER_SIZE = 10;
@@ -82,10 +92,6 @@ public ObjectCanvas getCanvas() {
 		return _canvas;
 	}
 
-	public void setObjectNode(IObjectNode objectNode) {
-		_objectNode = objectNode;
-	}
-
 	public void updateBounds(Bounds rect) {
 		_rect = rect;
 		updateFromZoomAndPanVariables();