From 67935f8f8acd7f608b2c66d6959e169a22828230 Mon Sep 17 00:00:00 2001 From: woodser <13068859+woodser@users.noreply.github.com> Date: Sat, 17 May 2025 20:22:56 -0400 Subject: [PATCH] remove changes to colored decimal places --- .../ColoredDecimalPlacesWithZerosText.java | 14 +++++--------- .../desktop/main/market/spread/SpreadView.java | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/desktop/src/main/java/haveno/desktop/components/ColoredDecimalPlacesWithZerosText.java b/desktop/src/main/java/haveno/desktop/components/ColoredDecimalPlacesWithZerosText.java index eb96664589..910114dbb2 100644 --- a/desktop/src/main/java/haveno/desktop/components/ColoredDecimalPlacesWithZerosText.java +++ b/desktop/src/main/java/haveno/desktop/components/ColoredDecimalPlacesWithZerosText.java @@ -26,37 +26,33 @@ import javafx.scene.layout.HBox; public class ColoredDecimalPlacesWithZerosText extends HBox { public ColoredDecimalPlacesWithZerosText(String number, int numberOfZerosToColorize) { - this(number, numberOfZerosToColorize, false); - } - - public ColoredDecimalPlacesWithZerosText(String number, int numberOfZerosToColorize, boolean highlight) { super(); if (numberOfZerosToColorize <= 0) { getChildren().addAll(new Label(number)); } else if (number.contains(FormattingUtils.RANGE_SEPARATOR)) { String[] splitNumber = number.split(FormattingUtils.RANGE_SEPARATOR); - Tuple2 numbers = getSplittedNumberNodes(splitNumber[0], numberOfZerosToColorize, highlight); + Tuple2 numbers = getSplittedNumberNodes(splitNumber[0], numberOfZerosToColorize); getChildren().addAll(numbers.first, numbers.second); getChildren().add(new Label(FormattingUtils.RANGE_SEPARATOR)); - numbers = getSplittedNumberNodes(splitNumber[1], numberOfZerosToColorize, highlight); + numbers = getSplittedNumberNodes(splitNumber[1], numberOfZerosToColorize); getChildren().addAll(numbers.first, numbers.second); } else { - Tuple2 numbers = getSplittedNumberNodes(number, numberOfZerosToColorize, highlight); + Tuple2 numbers = getSplittedNumberNodes(number, numberOfZerosToColorize); getChildren().addAll(numbers.first, numbers.second); } setAlignment(Pos.CENTER_LEFT); } - private Tuple2 getSplittedNumberNodes(String number, int numberOfZeros, boolean highlight) { + private Tuple2 getSplittedNumberNodes(String number, int numberOfZeros) { String placesBeforeZero = number.split("0{1," + Integer.toString(numberOfZeros) + "}$")[0]; String zeroDecimalPlaces = number.substring(placesBeforeZero.length()); Label first = new AutoTooltipLabel(placesBeforeZero); - if (highlight) first.getStyleClass().add("highlight-text"); Label last = new Label(zeroDecimalPlaces); last.getStyleClass().add("zero-decimals"); + return new Tuple2<>(first, last); } } diff --git a/desktop/src/main/java/haveno/desktop/main/market/spread/SpreadView.java b/desktop/src/main/java/haveno/desktop/main/market/spread/SpreadView.java index 0ffea7ef80..150b7c888a 100644 --- a/desktop/src/main/java/haveno/desktop/main/market/spread/SpreadView.java +++ b/desktop/src/main/java/haveno/desktop/main/market/spread/SpreadView.java @@ -273,7 +273,7 @@ public class SpreadView extends ActivatableViewAndModel