From 542cc4d5cfccd727d4a366335f9360e6ce564cbf Mon Sep 17 00:00:00 2001
From: Christoph Atteneder <christoph.atteneder@gmail.com>
Date: Mon, 11 Apr 2022 13:27:13 +0200
Subject: [PATCH] Remove close button duplication in DetailsWindows

---
 .../main/overlays/windows/BsqSwapOfferDetailsWindow.java | 8 +-------
 .../main/overlays/windows/BsqTradeDetailsWindow.java     | 8 +-------
 .../main/overlays/windows/OfferDetailsWindow.java        | 7 +------
 desktop/src/main/java/bisq/desktop/util/FormBuilder.java | 9 +++++++++
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/BsqSwapOfferDetailsWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/BsqSwapOfferDetailsWindow.java
index 38d9abf843..3cc03ed6f5 100644
--- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/BsqSwapOfferDetailsWindow.java
+++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/BsqSwapOfferDetailsWindow.java
@@ -47,10 +47,8 @@ import javax.inject.Named;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.image.ImageView;
-import javafx.scene.layout.GridPane;
 import javafx.scene.layout.HBox;
 
-import javafx.geometry.HPos;
 import javafx.geometry.Insets;
 
 import java.util.Optional;
@@ -253,11 +251,7 @@ public class BsqSwapOfferDetailsWindow extends Overlay<BsqSwapOfferDetailsWindow
         } else if (isTakeOfferScreen) {
             addConfirmAndCancelButtons(false);
         } else {
-            Button closeButton = addButtonAfterGroup(gridPane, ++rowIndex, Res.get("shared.close"));
-            GridPane.setColumnIndex(closeButton, 1);
-            GridPane.setHalignment(closeButton, HPos.RIGHT);
-
-            closeButton.setOnAction(e -> {
+            addCloseButton(gridPane, ++rowIndex, () -> {
                 closeHandlerOptional.ifPresent(Runnable::run);
                 hide();
             });
diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/BsqTradeDetailsWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/BsqTradeDetailsWindow.java
index cccd6040a9..f0def03342 100644
--- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/BsqTradeDetailsWindow.java
+++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/BsqTradeDetailsWindow.java
@@ -36,11 +36,8 @@ import org.bitcoinj.core.Transaction;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import javafx.scene.control.Button;
 import javafx.scene.control.TextArea;
-import javafx.scene.layout.GridPane;
 
-import javafx.geometry.HPos;
 import javafx.geometry.Insets;
 
 import javafx.beans.property.IntegerProperty;
@@ -205,10 +202,7 @@ public class BsqTradeDetailsWindow extends Overlay<BsqTradeDetailsWindow> {
                     bsqSwapTrade.getState().name());
         }
 
-        Button closeButton = addButtonAfterGroup(gridPane, ++rowIndex, Res.get("shared.close"));
-        GridPane.setColumnIndex(closeButton, 1);
-        GridPane.setHalignment(closeButton, HPos.RIGHT);
-        closeButton.setOnAction(e -> {
+        addCloseButton(gridPane, ++rowIndex, () -> {
             closeHandlerOptional.ifPresent(Runnable::run);
             hide();
         });
diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java
index 80e5828271..cbf9bd9858 100644
--- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java
+++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java
@@ -62,7 +62,6 @@ import javafx.scene.image.ImageView;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.HBox;
 
-import javafx.geometry.HPos;
 import javafx.geometry.Insets;
 
 import java.util.List;
@@ -376,11 +375,7 @@ public class OfferDetailsWindow extends Overlay<OfferDetailsWindow> {
 
             addConfirmAndCancelButtons(false);
         } else {
-            Button closeButton = addButtonAfterGroup(gridPane, ++rowIndex, Res.get("shared.close"));
-            GridPane.setColumnIndex(closeButton, 1);
-            GridPane.setHalignment(closeButton, HPos.RIGHT);
-
-            closeButton.setOnAction(e -> {
+            addCloseButton(gridPane, ++rowIndex, () -> {
                 closeHandlerOptional.ifPresent(Runnable::run);
                 hide();
             });
diff --git a/desktop/src/main/java/bisq/desktop/util/FormBuilder.java b/desktop/src/main/java/bisq/desktop/util/FormBuilder.java
index 96633f380b..3d006b7854 100644
--- a/desktop/src/main/java/bisq/desktop/util/FormBuilder.java
+++ b/desktop/src/main/java/bisq/desktop/util/FormBuilder.java
@@ -1961,6 +1961,15 @@ public class FormBuilder {
         return button;
     }
 
+    public static Button addCloseButton(GridPane gridPane, int rowIndex, Runnable closeHandler) {
+        Button closeButton = addButtonAfterGroup(gridPane, rowIndex, Res.get("shared.close"));
+        GridPane.setColumnIndex(closeButton, 1);
+        GridPane.setHalignment(closeButton, HPos.RIGHT);
+
+        closeButton.setOnAction(e -> closeHandler.run());
+
+        return closeButton;
+    }
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Button + Button