mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove close button duplication in DetailsWindows

Browse source
This commit is contained in:
Christoph Atteneder 2022-04-11 13:27:13 +02:00
parent 9a3ed33238
commit 542cc4d5cf
No known key found for this signature in database
GPG key ID: CD5DC1C529CDFD3B
4 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
desktop/src/main/java/bisq/desktop/main/overlays/windows/BsqSwapOfferDetailsWindow.java
View file

@ -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();
});

8
desktop/src/main/java/bisq/desktop/main/overlays/windows/BsqTradeDetailsWindow.java
View file

@ -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();
});

7
desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java
View file

@ -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();
});

9
desktop/src/main/java/bisq/desktop/util/FormBuilder.java
View file

@ -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