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

do not color currency code in offer book volume column

Browse source
This commit is contained in:
woodser 2025-06-28 10:17:38 -04:00 • committed by GitHub
parent b289a256ee
commit 8cca2cbb52
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookView.java
View file

@ -946,8 +946,9 @@ abstract public class OfferBookView<R extends GridPane, M extends OfferBookViewM
setGraphic(null); setGraphic(null);
} else { } else {
setText(""); setText("");
setGraphic(new ColoredDecimalPlacesWithZerosText(model.getVolume(item), ColoredDecimalPlacesWithZerosText volumeBox = new ColoredDecimalPlacesWithZerosText(model.getVolumeAmount(item), model.getNumberOfDecimalsForVolume(item));
model.getNumberOfDecimalsForVolume(item))); if (model.showAllTradeCurrenciesProperty.get()) volumeBox.getChildren().add(new Label(" " + item.getOffer().getCurrencyCode()));
setGraphic(volumeBox);
} }
} else { } else {
setText(""); setText("");

10
desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookViewModel.java
View file

@ -436,11 +436,19 @@ abstract class OfferBookViewModel extends ActivatableViewModel {
return formatVolume(item.getOffer(), true); return formatVolume(item.getOffer(), true);
} }
String getVolumeAmount(OfferBookListItem item) {
return formatVolume(item.getOffer(), true, false);
}
private String formatVolume(Offer offer, boolean decimalAligned) { private String formatVolume(Offer offer, boolean decimalAligned) {
return formatVolume(offer, decimalAligned, showAllTradeCurrenciesProperty.get());
}
private String formatVolume(Offer offer, boolean decimalAligned, boolean appendCurrencyCode) {
Volume offerVolume = offer.getVolume(); Volume offerVolume = offer.getVolume();
Volume minOfferVolume = offer.getMinVolume(); Volume minOfferVolume = offer.getMinVolume();
if (offerVolume != null && minOfferVolume != null) { if (offerVolume != null && minOfferVolume != null) {
String postFix = showAllTradeCurrenciesProperty.get() ? " " + offer.getCurrencyCode() : ""; String postFix = appendCurrencyCode ? " " + offer.getCurrencyCode() : "";
decimalAligned = decimalAligned && !showAllTradeCurrenciesProperty.get(); decimalAligned = decimalAligned && !showAllTradeCurrenciesProperty.get();
return VolumeUtil.formatVolume(offer, decimalAligned, maxPlacesForVolume.get()) + postFix; return VolumeUtil.formatVolume(offer, decimalAligned, maxPlacesForVolume.get()) + postFix;
} else { } else {