From 338d5a3ecf6fd687c4d30e4fe10b6cc48ba12d29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Louck=C3=BD?= <jakub.loucky@outlook.cz>
Date: Tue, 29 Dec 2020 01:04:47 +0100
Subject: [PATCH] Fix layout of button and checkbox in Receive funds

---
 .../main/funds/deposit/DepositView.java       | 19 +++++++++----------
 .../java/bisq/desktop/util/FormBuilder.java   | 18 ++++++++++++------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/desktop/src/main/java/bisq/desktop/main/funds/deposit/DepositView.java b/desktop/src/main/java/bisq/desktop/main/funds/deposit/DepositView.java
index 8aeb4ac4c1c..cc2c4fed018 100644
--- a/desktop/src/main/java/bisq/desktop/main/funds/deposit/DepositView.java
+++ b/desktop/src/main/java/bisq/desktop/main/funds/deposit/DepositView.java
@@ -42,6 +42,7 @@
 import bisq.common.UserThread;
 import bisq.common.app.DevEnv;
 import bisq.common.config.Config;
+import bisq.common.util.Tuple3;
 
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.Coin;
@@ -66,9 +67,9 @@
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.GridPane;
+import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 
-import javafx.geometry.HPos;
 import javafx.geometry.Insets;
 
 import org.fxmisc.easybind.EasyBind;
@@ -198,17 +199,15 @@ public void initialize() {
         addressTextField.setManaged(false);
         amountTextField.setManaged(false);
 
-        generateNewAddressButton = addButton(gridPane, ++gridRow, Res.get("funds.deposit.generateAddress"), -20);
-        GridPane.setColumnIndex(generateNewAddressButton, 0);
-        GridPane.setHalignment(generateNewAddressButton, HPos.LEFT);
-
-        generateNewAddressSegwitCheckbox = addCheckBox(gridPane, gridRow,
-                Res.get("funds.deposit.generateAddressSegwit"), 0);
+        Tuple3<Button, CheckBox, HBox> buttonCheckBoxHBox = addButtonCheckBoxWithBox(gridPane, ++gridRow,
+                Res.get("funds.deposit.generateAddress"),
+                Res.get("funds.deposit.generateAddressSegwit"),
+                15);
+        buttonCheckBoxHBox.third.setSpacing(25);
+        generateNewAddressButton = buttonCheckBoxHBox.first;
+        generateNewAddressSegwitCheckbox = buttonCheckBoxHBox.second;
         generateNewAddressSegwitCheckbox.setAllowIndeterminate(false);
         generateNewAddressSegwitCheckbox.setSelected(true);
-        GridPane.setColumnIndex(generateNewAddressSegwitCheckbox, 0);
-        GridPane.setHalignment(generateNewAddressSegwitCheckbox, HPos.LEFT);
-        GridPane.setMargin(generateNewAddressSegwitCheckbox, new Insets(15, 0, 0, 250));
 
         generateNewAddressButton.setOnAction(event -> {
             boolean segwit = generateNewAddressSegwitCheckbox.isSelected();
diff --git a/desktop/src/main/java/bisq/desktop/util/FormBuilder.java b/desktop/src/main/java/bisq/desktop/util/FormBuilder.java
index 5c676b4477b..94013d6acab 100644
--- a/desktop/src/main/java/bisq/desktop/util/FormBuilder.java
+++ b/desktop/src/main/java/bisq/desktop/util/FormBuilder.java
@@ -901,20 +901,26 @@ public static Tuple2<Button, CheckBox> addButtonCheckBox(GridPane gridPane,
                                                              String buttonTitle,
                                                              String checkBoxTitle,
                                                              double top) {
+        final Tuple3<Button, CheckBox, HBox> tuple = addButtonCheckBoxWithBox(gridPane, rowIndex, buttonTitle, checkBoxTitle, top);
+        return new Tuple2<>(tuple.first, tuple.second);
+    }
+
+    public static Tuple3<Button, CheckBox, HBox> addButtonCheckBoxWithBox(GridPane gridPane,
+                                                             int rowIndex,
+                                                             String buttonTitle,
+                                                             String checkBoxTitle,
+                                                             double top) {
         Button button = new AutoTooltipButton(buttonTitle);
-        button.setDefaultButton(true);
         CheckBox checkBox = new AutoTooltipCheckBox(checkBoxTitle);
-        HBox.setMargin(checkBox, new Insets(6, 0, 0, 0));
 
-        HBox hBox = new HBox();
-        hBox.setSpacing(20);
+        HBox hBox = new HBox(20);
+        hBox.setAlignment(Pos.CENTER_LEFT);
         hBox.getChildren().addAll(button, checkBox);
         GridPane.setRowIndex(hBox, rowIndex);
-        GridPane.setColumnIndex(hBox, 1);
         hBox.setPadding(new Insets(top, 0, 0, 0));
         gridPane.getChildren().add(hBox);
 
-        return new Tuple2<>(button, checkBox);
+        return new Tuple3<>(button, checkBox, hBox);
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////