From 2b47505df8c55f528652763aa8a997030e6cfed5 Mon Sep 17 00:00:00 2001
From: woodser <13068859+woodser@users.noreply.github.com>
Date: Wed, 14 May 2025 10:24:37 -0400
Subject: [PATCH] fix table roundedness in portfolio

---
 .../src/main/java/haveno/desktop/haveno.css   | 10 ++--------
 .../pendingtrades/PendingTradesView.java      |  2 ++
 .../java/haveno/desktop/util/GUIUtil.java     | 19 +------------------
 3 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/desktop/src/main/java/haveno/desktop/haveno.css b/desktop/src/main/java/haveno/desktop/haveno.css
index 7dfddc4763..87f9e67cc9 100644
--- a/desktop/src/main/java/haveno/desktop/haveno.css
+++ b/desktop/src/main/java/haveno/desktop/haveno.css
@@ -172,7 +172,7 @@
 }
 
 .compact-button, .table-cell .jfx-button, .action-button.compact-button {
-    -fx-padding: 0 10 0 10;
+    -fx-padding: 0 7 0 7;
 }
 
 .tiny-button,
@@ -1170,14 +1170,10 @@ textfield */
 
 .table-view .column-header.first-column {
     -fx-padding: 0 0 0 15;
-    -fx-background-radius: 15 0 0 0;
-    -fx-border-radius: 15 0 0 0;
 }
 
 .table-view .column-header.last-column {
     -fx-padding: 0 15 0 0;
-    -fx-background-radius: 0 15 0 0;
-    -fx-border-radius: 0 15 0 0;
 }
 
 .number-column.table-cell {
@@ -1191,13 +1187,11 @@ textfield */
 
 .table-view {
     -fx-control-inner-background-alt: -fx-control-inner-background;
-    -fx-background-radius: 15;
-    -fx-border-radius: 15;
     -fx-padding: 0;
 }
 
 .table-view .column-header-background {
-    -fx-background-color: transparent;
+    -fx-background-color: -bs-color-background-pane;
     -fx-border-color: -bs-color-border-form-field;
     -fx-border-width: 0 0 1 0;
 }
diff --git a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesView.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesView.java
index b08f464d8c..bf79494a72 100644
--- a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesView.java
+++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesView.java
@@ -978,6 +978,8 @@ public class PendingTradesView extends ActivatableViewAndModel<VBox, PendingTrad
 
                                     HBox hBox = new HBox();
                                     hBox.setSpacing(0);
+                                    hBox.setAlignment(Pos.CENTER);
+                                    hBox.setTranslateX(7); // correlates with .compact-button, .table-cell .jfx-button, .action-button.compact-button
                                     hBox.getChildren().addAll(warnIconButton, trashIconButton);
                                     setGraphic(hBox);
                                 } else {
diff --git a/desktop/src/main/java/haveno/desktop/util/GUIUtil.java b/desktop/src/main/java/haveno/desktop/util/GUIUtil.java
index 5d7a50d54d..8b256e4f46 100644
--- a/desktop/src/main/java/haveno/desktop/util/GUIUtil.java
+++ b/desktop/src/main/java/haveno/desktop/util/GUIUtil.java
@@ -1113,7 +1113,6 @@ public class GUIUtil {
         tableView.skinProperty().addListener((obs, oldSkin, newSkin) -> {
             if (newSkin != null) {
                 Platform.runLater(() -> {
-                    addScrollBarVisibilityListener(tableView);
                     updateEdgeColumnStyleClasses(tableView);
                 });
             }
@@ -1141,25 +1140,9 @@ public class GUIUtil {
                 first.getStyleClass().add("first-column");
             }
 
-            boolean hasVerticalScrollBar = tableView.lookupAll(".scroll-bar")
-                    .stream()
-                    .filter(node -> node instanceof ScrollBar)
-                    .map(node -> (ScrollBar) node)
-                    .anyMatch(scrollBar -> scrollBar.getOrientation() == Orientation.VERTICAL
-                            && scrollBar.isVisible());
-
-            if (!last.getStyleClass().contains("last-column") && !hasVerticalScrollBar) {
+            if (!last.getStyleClass().contains("last-column")) {
                 last.getStyleClass().add("last-column");
             }
         }
     }
-
-    private static void addScrollBarVisibilityListener(TableView<?> tableView) {
-        for (Node node : tableView.lookupAll(".scroll-bar")) {
-            if (node instanceof ScrollBar sb && sb.getOrientation() == Orientation.VERTICAL) {
-                sb.visibleProperty().addListener((obs, wasVisible, isNowVisible) ->
-                    Platform.runLater(() -> updateEdgeColumnStyleClasses(tableView)));
-            }
-        }
-    }
 }