From cec515e116a2e41f5870fe830aff9ae2b58db72a Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Mon, 14 Dec 2020 20:32:39 +0100
Subject: [PATCH] Improve layout of pad selection in trigger settings
---
.../playpad/view/main/ProjectPreviewView.java | 34 ++++++++++++-------
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/view/main/ProjectPreviewView.java b/PlayWallCore/src/main/java/de/tobias/playpad/view/main/ProjectPreviewView.java
index bb9abce4..2e16c3cb 100644
--- a/PlayWallCore/src/main/java/de/tobias/playpad/view/main/ProjectPreviewView.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/view/main/ProjectPreviewView.java
@@ -6,6 +6,9 @@ import de.tobias.playpad.project.Project;
import de.tobias.playpad.project.page.Page;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
import javafx.scene.control.Pagination;
import javafx.scene.control.ToggleButton;
import javafx.scene.control.Tooltip;
@@ -24,22 +27,27 @@ public class ProjectPreviewView extends Pagination {
this.selected = FXCollections.observableArrayList(preSelect);
setCurrentPageIndex(initialPage);
- setPageFactory(index -> {
- GridPane gridPane = new GridPane();
- gridPane.setHgap(7);
- gridPane.setVgap(7);
+ setPageFactory(this::getPageNode);
+ }
+
+ private Node getPageNode(int index) {
+ GridPane gridPane = new GridPane();
+ gridPane.setHgap(7);
+ gridPane.setVgap(7);
+ gridPane.setAlignment(Pos.CENTER);
+
+ gridPane.setPadding(new Insets(0, 0, 7, 0));
- final Page page = project.getPage(index);
- for (int x = 0; x < project.getSettings().getColumns(); x++) {
- for (int y = 0; y < project.getSettings().getRows(); y++) {
- final Pad pad = page.getPad(x, y);
- ToggleButton toggleButton = getToggleButton(preSelect, pad);
+ final Page page = project.getPage(index);
+ for (int x = 0; x < project.getSettings().getColumns(); x++) {
+ for (int y = 0; y < project.getSettings().getRows(); y++) {
+ final Pad pad = page.getPad(x, y);
+ ToggleButton toggleButton = getToggleButton(selected, pad);
- gridPane.add(toggleButton, x, y);
- }
+ gridPane.add(toggleButton, x, y);
}
- return gridPane;
- });
+ }
+ return gridPane;
}
private ToggleButton getToggleButton(List<Pad> preSelect, Pad pad) {
--
GitLab