Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-06-24 14:50:28 -04:00
Code Issues Projects Releases Packages Wiki Activity

fix extra padding taking range offer

Browse source
This commit is contained in:
woodser 2025-05-29 11:02:38 -04:00
parent a2f405b370
commit c318be6da0
No known key found for this signature in database
GPG key ID: 55A10DD48ADEE5EF
1 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

20
desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferView.java
View file

@ -339,8 +339,10 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
if (model.isRange()) { if (model.isRange()) {
amountRangeTextField.setText(model.getAmountRange()); amountRangeTextField.setText(model.getAmountRange());
amountRangeBox.setVisible(true); amountRangeBox.setVisible(true);
amountRangeBox.setManaged(true);
} else { } else {
amountTextField.setDisable(true); amountTextField.setDisable(true);
amountTextField.setManaged(true);
} }
priceTextField.setText(model.getPrice()); priceTextField.setText(model.getPrice());
@ -496,13 +498,16 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
} }
cancelButton2.setVisible(true); cancelButton2.setVisible(true);
cancelButton2.setManaged(true);
// temporarily disabled due to high CPU usage (per issue #4649) // temporarily disabled due to high CPU usage (per issue #4649)
//waitingForFundsBusyAnimation.play(); //waitingForFundsBusyAnimation.play();
if (model.getOffer().hasBuyerAsTakerWithoutDeposit()) { if (model.getOffer().hasBuyerAsTakerWithoutDeposit()) {
noFundingRequiredTitledGroupBg.setVisible(true); noFundingRequiredTitledGroupBg.setVisible(true);
noFundingRequiredTitledGroupBg.setManaged(true);
noFundingRequiredLabel.setVisible(true); noFundingRequiredLabel.setVisible(true);
noFundingRequiredLabel.setManaged(true);
if (model.getOffer().getCombinedExtraInfo() != null && !model.getOffer().getCombinedExtraInfo().isEmpty()) { if (model.getOffer().getCombinedExtraInfo() != null && !model.getOffer().getCombinedExtraInfo().isEmpty()) {
extraInfoLabel.setVisible(true); extraInfoLabel.setVisible(true);
extraInfoLabel.setManaged(true); extraInfoLabel.setManaged(true);
@ -511,10 +516,15 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
} }
} else { } else {
payFundsTitledGroupBg.setVisible(true); payFundsTitledGroupBg.setVisible(true);
payFundsTitledGroupBg.setManaged(true);
totalToPayTextField.setVisible(true); totalToPayTextField.setVisible(true);
totalToPayTextField.setManaged(true);
addressTextField.setVisible(true); addressTextField.setVisible(true);
addressTextField.setManaged(true);
qrCodeImageView.setVisible(true); qrCodeImageView.setVisible(true);
qrCodeImageView.setManaged(true);
balanceTextField.setVisible(true); balanceTextField.setVisible(true);
balanceTextField.setManaged(true);
} }
totalToPayTextField.setFundsStructure(Res.get("takeOffer.fundsBox.fundsStructure", totalToPayTextField.setFundsStructure(Res.get("takeOffer.fundsBox.fundsStructure",
@ -675,6 +685,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
if (isOfferAvailable) { if (isOfferAvailable) {
offerAvailabilityBusyAnimation.stop(); offerAvailabilityBusyAnimation.stop();
offerAvailabilityBusyAnimation.setVisible(false); offerAvailabilityBusyAnimation.setVisible(false);
offerAvailabilityBusyAnimation.setManaged(false);
if (!model.isRange() && !model.showPayFundsScreenDisplayed.get()) if (!model.isRange() && !model.showPayFundsScreenDisplayed.get())
showNextStepAfterAmountIsSet(); showNextStepAfterAmountIsSet();
} }
@ -893,10 +904,12 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
noFundingRequiredTitledGroupBg.getStyleClass().add("last"); noFundingRequiredTitledGroupBg.getStyleClass().add("last");
GridPane.setColumnSpan(noFundingRequiredTitledGroupBg, 2); GridPane.setColumnSpan(noFundingRequiredTitledGroupBg, 2);
noFundingRequiredTitledGroupBg.setVisible(false); noFundingRequiredTitledGroupBg.setVisible(false);
noFundingRequiredTitledGroupBg.setManaged(false);
// no funding required description // no funding required description
noFundingRequiredLabel = new AutoTooltipLabel(Res.get("takeOffer.fundsBox.noFundingRequiredDescription")); noFundingRequiredLabel = new AutoTooltipLabel(Res.get("takeOffer.fundsBox.noFundingRequiredDescription"));
noFundingRequiredLabel.setVisible(false); noFundingRequiredLabel.setVisible(false);
noFundingRequiredLabel.setManaged(false);
//GridPane.setRowSpan(noFundingRequiredLabel, 1); //GridPane.setRowSpan(noFundingRequiredLabel, 1);
GridPane.setRowIndex(noFundingRequiredLabel, gridRow); GridPane.setRowIndex(noFundingRequiredLabel, gridRow);
noFundingRequiredLabel.setPadding(new Insets(Layout.COMPACT_FIRST_ROW_AND_GROUP_DISTANCE, 0, 0, 0)); noFundingRequiredLabel.setPadding(new Insets(Layout.COMPACT_FIRST_ROW_AND_GROUP_DISTANCE, 0, 0, 0));
@ -910,13 +923,16 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
payFundsTitledGroupBg.getStyleClass().add("last"); payFundsTitledGroupBg.getStyleClass().add("last");
GridPane.setColumnSpan(payFundsTitledGroupBg, 2); GridPane.setColumnSpan(payFundsTitledGroupBg, 2);
payFundsTitledGroupBg.setVisible(false); payFundsTitledGroupBg.setVisible(false);
payFundsTitledGroupBg.setManaged(false);
totalToPayTextField = addFundsTextfield(gridPane, gridRow, totalToPayTextField = addFundsTextfield(gridPane, gridRow,
Res.get("shared.totalsNeeded"), Layout.COMPACT_FIRST_ROW_AND_GROUP_DISTANCE); Res.get("shared.totalsNeeded"), Layout.COMPACT_FIRST_ROW_AND_GROUP_DISTANCE);
totalToPayTextField.setVisible(false); totalToPayTextField.setVisible(false);
totalToPayTextField.setManaged(false);
qrCodeImageView = new ImageView(); qrCodeImageView = new ImageView();
qrCodeImageView.setVisible(false); qrCodeImageView.setVisible(false);
qrCodeImageView.setManaged(false);
qrCodeImageView.setFitHeight(150); qrCodeImageView.setFitHeight(150);
qrCodeImageView.setFitWidth(150); qrCodeImageView.setFitWidth(150);
qrCodeImageView.getStyleClass().add("qr-code"); qrCodeImageView.getStyleClass().add("qr-code");
@ -933,9 +949,11 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
addressTextField = addAddressTextField(gridPane, ++gridRow, Res.get("shared.tradeWalletAddress")); addressTextField = addAddressTextField(gridPane, ++gridRow, Res.get("shared.tradeWalletAddress"));
addressTextField.setVisible(false); addressTextField.setVisible(false);
addressTextField.setManaged(false);
balanceTextField = addBalanceTextField(gridPane, ++gridRow, Res.get("shared.tradeWalletBalance")); balanceTextField = addBalanceTextField(gridPane, ++gridRow, Res.get("shared.tradeWalletBalance"));
balanceTextField.setVisible(false); balanceTextField.setVisible(false);
balanceTextField.setManaged(false);
fundingHBox = new HBox(); fundingHBox = new HBox();
fundingHBox.setVisible(false); fundingHBox.setVisible(false);
@ -1012,6 +1030,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
}); });
cancelButton2.setDefaultButton(false); cancelButton2.setDefaultButton(false);
cancelButton2.setVisible(false); cancelButton2.setVisible(false);
cancelButton2.setManaged(false);
} }
private void openWallet() { private void openWallet() {
@ -1112,6 +1131,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
fakeXLabel = new Label(); fakeXLabel = new Label();
fakeXIcon = getIconForLabel(MaterialDesignIcon.CLOSE, "2em", fakeXLabel); fakeXIcon = getIconForLabel(MaterialDesignIcon.CLOSE, "2em", fakeXLabel);
fakeXLabel.setVisible(false); // we just use it to get the same layout as the upper row fakeXLabel.setVisible(false); // we just use it to get the same layout as the upper row
fakeXIcon.setManaged(false);
fakeXLabel.getStyleClass().add("opaque-icon-character"); fakeXLabel.getStyleClass().add("opaque-icon-character");
HBox hBox = new HBox(); HBox hBox = new HBox();