From 88955efae76fc4a915cbc6ede50291e39283c145 Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Wed, 21 Nov 2018 10:44:35 +0100 Subject: [PATCH] Synchronize padding between create and take offer views --- .../desktop/main/offer/MutableOfferView.java | 10 +++-- .../main/offer/takeoffer/TakeOfferView.java | 45 ++++++++++--------- .../steps/buyer/BuyerStep4View.java | 7 +-- 3 files changed, 35 insertions(+), 27 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java index f35ec019e8..11d08d28cf 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java @@ -144,7 +144,7 @@ public abstract class MutableOfferView extends private FundsTextField totalToPayTextField; private Label amountDescriptionLabel, priceCurrencyLabel, priceDescriptionLabel, volumeDescriptionLabel, waitingForFundsLabel, marketBasedPriceLabel, percentagePriceDescription, tradeFeeDescriptionLabel, - resultLabel, tradeFeeInBtcLabel, tradeFeeInBsqLabel, xLabel; + resultLabel, tradeFeeInBtcLabel, tradeFeeInBsqLabel, xLabel, fakeXLabel; protected Label amountBtcLabel, volumeCurrencyLabel, minAmountBtcLabel; private ComboBox paymentAccountsComboBox; private ComboBox currencyComboBox; @@ -492,6 +492,7 @@ public abstract class MutableOfferView extends xLabel.getStyleClass().add("small"); xIcon.setStyle(String.format("-fx-font-family: %s; -fx-font-size: %s;", MaterialDesignIcon.CLOSE.fontFamily(), "1em")); fakeXIcon.setStyle(String.format("-fx-font-family: %s; -fx-font-size: %s;", MaterialDesignIcon.CLOSE.fontFamily(), "1em")); + fakeXLabel.getStyleClass().add("small"); } private void maybeShowClearXchangeWarning(PaymentAccount paymentAccount) { @@ -1367,9 +1368,9 @@ public abstract class MutableOfferView extends Tuple2 amountInputBoxTuple = getTradeInputBox(minAmountValueCurrencyBox, Res.get("createOffer.amountPriceBox.minAmountDescription")); - Label fakeXLabel = new Label(); + fakeXLabel = new Label(); fakeXIcon = getIconForLabel(MaterialDesignIcon.CLOSE, "2em", fakeXLabel); - fakeXLabel.setPadding(new Insets(24, 3, 0, 3)); + fakeXLabel.getStyleClass().add("opaque-icon-character"); fakeXLabel.setVisible(false); // we just use it to get the same layout as the upper row // Fixed/Percentage toggle @@ -1381,12 +1382,13 @@ public abstract class MutableOfferView extends updatePriceToggleButtons(model.getDataModel().getUseMarketBasedPrice().getValue())); secondRowHBox = new HBox(); + secondRowHBox.setSpacing(5); secondRowHBox.setAlignment(Pos.CENTER_LEFT); secondRowHBox.getChildren().addAll(amountInputBoxTuple.second, fakeXLabel, fixedPriceBox, priceTypeToggleButton); GridPane.setRowIndex(secondRowHBox, ++gridRow); GridPane.setColumnIndex(secondRowHBox, 0); - GridPane.setMargin(secondRowHBox, new Insets(0, 10, 18, 0)); + GridPane.setMargin(secondRowHBox, new Insets(0, 10, 10, 0)); gridPane.getChildren().add(secondRowHBox); } diff --git a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java index 9913313e4b..930e586d38 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java @@ -129,14 +129,15 @@ public class TakeOfferView extends ActivatableViewAndModel paymentAccountsComboBox; private Label amountDescriptionLabel, paymentMethodLabel, priceCurrencyLabel, priceAsPercentageLabel, volumeCurrencyLabel, priceDescriptionLabel, volumeDescriptionLabel, waitingForFundsLabel, offerAvailabilityLabel, amountCurrency, priceAsPercentageDescription, - tradeFeeDescriptionLabel, resultLabel, tradeFeeInBtcLabel, tradeFeeInBsqLabel; + tradeFeeDescriptionLabel, resultLabel, tradeFeeInBtcLabel, tradeFeeInBsqLabel, xLabel, + fakeXLabel; private InputTextField amountTextField; private TextField paymentMethodTextField, currencyTextField, priceTextField, priceAsPercentageTextField, volumeTextField, amountRangeTextField; @@ -566,6 +567,8 @@ public class TakeOfferView extends ActivatableViewAndModel priceValueCurrencyBoxTuple = getNonEditableValueBox(); @@ -1114,7 +1117,7 @@ public class TakeOfferView extends ActivatableViewAndModel volumeValueCurrencyBoxTuple = getNonEditableValueBoxWithInfo(); @@ -1127,13 +1130,14 @@ public class TakeOfferView extends ActivatableViewAndModel getTradeInputBox(HBox amountValueBox, String promptText) { Label descriptionLabel = new AutoTooltipLabel(promptText); descriptionLabel.setId("input-description-label"); - descriptionLabel.setPrefWidth(190); + descriptionLabel.setPrefWidth(170); VBox box = new VBox(); - box.setSpacing(4); + box.setPadding(new Insets(10, 0, 0, 0)); + box.setSpacing(2); box.getChildren().addAll(descriptionLabel, amountValueBox); return new Tuple2<>(descriptionLabel, box); } diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java index 142e642f1c..687124788c 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java +++ b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java @@ -129,7 +129,7 @@ public class BuyerStep4View extends TradeStepView { gridPane.getColumnConstraints().get(1).setHgrow(Priority.SOMETIMES); addTitledGroupBg(gridPane, gridRow, 5, Res.get("portfolio.pending.step5_buyer.groupTitle"), 0); - addCompactTopLabelTextField(gridPane, gridRow, getBtcTradeAmountLabel(), model.getTradeVolume(), Layout.FIRST_ROW_DISTANCE); + addCompactTopLabelTextField(gridPane, gridRow, getBtcTradeAmountLabel(), model.getTradeVolume(), Layout.TWICE_FIRST_ROW_DISTANCE); addCompactTopLabelTextField(gridPane, ++gridRow, getFiatTradeAmountLabel(), model.getFiatVolume()); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("portfolio.pending.step5_buyer.refunded"), model.getSecurityDeposit()); @@ -139,7 +139,8 @@ public class BuyerStep4View extends TradeStepView { Res.get("portfolio.pending.step5_buyer.takersMiningFee"); addCompactTopLabelTextField(gridPane, ++gridRow, miningFee, model.getTxFee()); withdrawTitledGroupBg = addTitledGroupBg(gridPane, ++gridRow, 1, Res.get("portfolio.pending.step5_buyer.withdrawBTC"), Layout.COMPACT_GROUP_DISTANCE); - addCompactTopLabelTextField(gridPane, gridRow, Res.get("portfolio.pending.step5_buyer.amount"), model.getPayoutAmount(), Layout.COMPACT_FIRST_ROW_AND_GROUP_DISTANCE); + withdrawTitledGroupBg.getStyleClass().add("last"); + addCompactTopLabelTextField(gridPane, gridRow, Res.get("portfolio.pending.step5_buyer.amount"), model.getPayoutAmount(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); withdrawAddressTextField = addInputTextField(gridPane, ++gridRow, Res.get("portfolio.pending.step5_buyer.withdrawToAddress")); withdrawAddressTextField.setManaged(false); withdrawAddressTextField.setVisible(false); @@ -155,7 +156,7 @@ public class BuyerStep4View extends TradeStepView { withdrawToExternalWalletButton.setDefaultButton(false); hBox.getChildren().addAll(useSavingsWalletButton, label, withdrawToExternalWalletButton); GridPane.setRowIndex(hBox, ++gridRow); - GridPane.setMargin(hBox, new Insets(15, 10, 0, 0)); + GridPane.setMargin(hBox, new Insets(5, 10, 0, 0)); gridPane.getChildren().add(hBox); useSavingsWalletButton.setOnAction(e -> {