From 8c7e6b2a365f986534e958a4dacc9f7a548a57f7 Mon Sep 17 00:00:00 2001 From: woodser <13068859+woodser@users.noreply.github.com> Date: Sat, 17 May 2025 15:27:44 -0400 Subject: [PATCH] spread view columns highlighted --- .../ColoredDecimalPlacesWithZerosText.java | 14 +++++++++----- desktop/src/main/java/haveno/desktop/haveno.css | 5 +++++ .../desktop/main/market/spread/SpreadView.java | 6 +++--- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/desktop/src/main/java/haveno/desktop/components/ColoredDecimalPlacesWithZerosText.java b/desktop/src/main/java/haveno/desktop/components/ColoredDecimalPlacesWithZerosText.java index 910114dbb2..eb96664589 100644 --- a/desktop/src/main/java/haveno/desktop/components/ColoredDecimalPlacesWithZerosText.java +++ b/desktop/src/main/java/haveno/desktop/components/ColoredDecimalPlacesWithZerosText.java @@ -26,33 +26,37 @@ 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); + Tuple2 numbers = getSplittedNumberNodes(splitNumber[0], numberOfZerosToColorize, highlight); getChildren().addAll(numbers.first, numbers.second); getChildren().add(new Label(FormattingUtils.RANGE_SEPARATOR)); - numbers = getSplittedNumberNodes(splitNumber[1], numberOfZerosToColorize); + numbers = getSplittedNumberNodes(splitNumber[1], numberOfZerosToColorize, highlight); getChildren().addAll(numbers.first, numbers.second); } else { - Tuple2 numbers = getSplittedNumberNodes(number, numberOfZerosToColorize); + Tuple2 numbers = getSplittedNumberNodes(number, numberOfZerosToColorize, highlight); getChildren().addAll(numbers.first, numbers.second); } setAlignment(Pos.CENTER_LEFT); } - private Tuple2 getSplittedNumberNodes(String number, int numberOfZeros) { + private Tuple2 getSplittedNumberNodes(String number, int numberOfZeros, boolean highlight) { 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/haveno.css b/desktop/src/main/java/haveno/desktop/haveno.css index 2a505b2133..933929a224 100644 --- a/desktop/src/main/java/haveno/desktop/haveno.css +++ b/desktop/src/main/java/haveno/desktop/haveno.css @@ -2542,3 +2542,8 @@ textfield */ -fx-border-width: 1; -fx-border-color: -bs-color-border-form-field; } + + +.highlight-text { + -fx-text-fill: -fx-dark-text-color !important; +} 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 6885c2844f..0ffea7ef80 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 @@ -261,7 +261,7 @@ public class SpreadView extends ActivatableViewAndModel new ReadOnlyObjectWrapper<>(item.getValue())); column.setCellFactory( new Callback<>() { @@ -273,7 +273,7 @@ public class SpreadView extends ActivatableViewAndModel new ReadOnlyObjectWrapper<>(item.getValue())); column.setCellFactory( new Callback<>() {