Fixed legend layout.

Author: RickRainerLudwig

charts/src/main/java/com/puresoltechnologies/javafx/charts/ChartView.java

@@ -21,6 +21,7 @@
 import javafx.collections.ObservableList;
 import javafx.geometry.HPos;
 import javafx.geometry.Insets;
+import javafx.geometry.Orientation;
 import javafx.geometry.Pos;
 import javafx.geometry.VPos;
 import javafx.scene.control.ContextMenu;
@@ -71,7 +72,7 @@ public enum LegendPosition {
     private final BorderPane plotBorderPane = new BorderPane();
     private final Label titleLabel = new Label();
     private final Label subTitleLabel = new Label();
-    private final LegendPane legendPane = new LegendPane(plotCanvas.getPlots());
+    private final LegendPane legendPane = new LegendPane(this, plotCanvas.getPlots());
 
     public ChartView(String title) {
 	this();
@@ -107,7 +108,7 @@ public ChartView() {
 	getChildren().addAll(titleLabel, subTitleLabel, plotBorderPane);
 	setMaxHeight(Double.MAX_VALUE);
 	setMaxWidth(Double.MAX_VALUE);
-	setGridLinesVisible(true);
+	setGridLinesVisible(false);
     }
 
     private void configureLegendTable() {
@@ -120,15 +121,19 @@ private void applyLegend() {
 	switch (legendPosition.get()) {
 	case LEFT:
 	    plotBorderPane.setLeft(legendPane);
+	    legendPane.setOrientation(Orientation.VERTICAL);
 	    break;
 	case RIGHT:
 	    plotBorderPane.setRight(legendPane);
+	    legendPane.setOrientation(Orientation.VERTICAL);
 	    break;
 	case TOP:
 	    plotBorderPane.setTop(legendPane);
+	    legendPane.setOrientation(Orientation.HORIZONTAL);
 	    break;
 	case BOTTOM:
 	    plotBorderPane.setBottom(legendPane);
+	    legendPane.setOrientation(Orientation.HORIZONTAL);
 	    break;
 	default:
 	    // intentionally left empty

charts/src/main/java/com/puresoltechnologies/javafx/charts/LegendPane.java

@@ -5,19 +5,38 @@
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.geometry.HPos;
+import javafx.geometry.Insets;
 import javafx.geometry.VPos;
 import javafx.scene.control.Label;
-import javafx.scene.layout.FlowPane;
+import javafx.scene.layout.Background;
+import javafx.scene.layout.BackgroundFill;
+import javafx.scene.layout.CornerRadii;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.Priority;
+import javafx.scene.layout.TilePane;
 
-public class LegendPane extends FlowPane {
+public class LegendPane extends TilePane {
 
-    public LegendPane(ObservableList<Plot<?, ?, ?>> plots) {
+    private final ChartView chartView;
+
+    public LegendPane(ChartView chartView, ObservableList<Plot<?, ?, ?>> plots) {
+	this.chartView = chartView;
+	setPadding(new Insets(5.0));
+	setHgap(5.0);
+	setVgap(5.0);
 	plots.addListener((ListChangeListener<Plot<?, ?, ?>>) (change) -> {
 	    showSymbols(change.getList());
 	});
+	chartView.backgroundColorProperty().addListener((observable, oldValue, newValue) -> {
+	    updateBackground();
+	});
+	updateBackground();
+    }
+
+    private void updateBackground() {
+	setBackground(
+		new Background(new BackgroundFill(chartView.getBackgroundColor(), CornerRadii.EMPTY, Insets.EMPTY)));
     }
 
     private void showSymbols(ObservableList<? extends Plot<?, ?, ?>> plots) {