From bac515d5ca7b46c0b0665c6a82e7447fb459af8d Mon Sep 17 00:00:00 2001 From: woodser <13068859+woodser@users.noreply.github.com> Date: Wed, 21 May 2025 10:37:03 -0400 Subject: [PATCH] add margin columns to tables --- .../src/main/java/haveno/desktop/haveno.css | 8 +++---- .../java/haveno/desktop/util/GUIUtil.java | 23 +++++++++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/desktop/src/main/java/haveno/desktop/haveno.css b/desktop/src/main/java/haveno/desktop/haveno.css index d8e317fb68..2926757ea1 100644 --- a/desktop/src/main/java/haveno/desktop/haveno.css +++ b/desktop/src/main/java/haveno/desktop/haveno.css @@ -1143,7 +1143,7 @@ textfield */ } .table-view .table-cell.last-column { - -fx-padding: 6 15 4 0; + -fx-padding: 6 0 4 0; } .table-view .table-cell.avatar-column { @@ -1152,18 +1152,18 @@ textfield */ } .table-view .table-cell.first-column { - -fx-padding: 6 0 4 15; + -fx-padding: 6 0 4 0; } .table-view .column-header.last-column .label { } .table-view .column-header.first-column { - -fx-padding: 0 0 0 15; + -fx-padding: 0 0 0 0; } .table-view .column-header.last-column { - -fx-padding: 0 15 0 0; + -fx-padding: 0 0 0 0; } .table-view .column-header.avatar-column { diff --git a/desktop/src/main/java/haveno/desktop/util/GUIUtil.java b/desktop/src/main/java/haveno/desktop/util/GUIUtil.java index 38a374d3ae..e637561495 100644 --- a/desktop/src/main/java/haveno/desktop/util/GUIUtil.java +++ b/desktop/src/main/java/haveno/desktop/util/GUIUtil.java @@ -81,6 +81,7 @@ import javafx.scene.control.ListCell; import javafx.scene.control.ListView; import javafx.scene.control.ScrollBar; import javafx.scene.control.ScrollPane; +import javafx.scene.control.TableCell; import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; import javafx.scene.control.TextArea; @@ -1095,6 +1096,7 @@ public class GUIUtil { public static void applyTableStyle(TableView tableView, boolean applyRoundedArc) { if (applyRoundedArc) applyRoundedArc(tableView); + addSpacerColumns(tableView); applyEdgeColumnStyleClasses(tableView); } @@ -1109,6 +1111,27 @@ public class GUIUtil { }); } + private static void addSpacerColumns(TableView tableView) { + TableColumn leftSpacer = new TableColumn<>(); + TableColumn rightSpacer = new TableColumn<>(); + + configureSpacerColumn(leftSpacer); + configureSpacerColumn(rightSpacer); + + tableView.getColumns().add(0, leftSpacer); + tableView.getColumns().add(rightSpacer); + } + + private static void configureSpacerColumn(TableColumn column) { + column.setPrefWidth(15); + column.setMaxWidth(15); + column.setMinWidth(15); + column.setReorderable(false); + column.setResizable(false); + column.setSortable(false); + column.setCellFactory(col -> new TableCell<>()); // empty cell + } + private static void applyEdgeColumnStyleClasses(TableView tableView) { ListChangeListener> columnListener = change -> { updateEdgeColumnStyleClasses(tableView);