remove changes to colored decimal places

This commit is contained in:
woodser 2025-05-17 20:22:56 -04:00
parent b5e726f3ad
commit 67935f8f8a
No known key found for this signature in database
GPG key ID: 55A10DD48ADEE5EF
2 changed files with 6 additions and 10 deletions

View file

@ -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<Label, Label> numbers = getSplittedNumberNodes(splitNumber[0], numberOfZerosToColorize, highlight);
Tuple2<Label, Label> 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<Label, Label> numbers = getSplittedNumberNodes(number, numberOfZerosToColorize, highlight);
Tuple2<Label, Label> numbers = getSplittedNumberNodes(number, numberOfZerosToColorize);
getChildren().addAll(numbers.first, numbers.second);
}
setAlignment(Pos.CENTER_LEFT);
}
private Tuple2<Label, Label> getSplittedNumberNodes(String number, int numberOfZeros, boolean highlight) {
private Tuple2<Label, Label> 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);
}
}

View file

@ -273,7 +273,7 @@ public class SpreadView extends ActivatableViewAndModel<GridPane, SpreadViewMode
public void updateItem(final SpreadItem item, boolean empty) {
super.updateItem(item, empty);
if (item != null && !empty)
setGraphic(new ColoredDecimalPlacesWithZerosText(model.getAmount(item.totalAmount), GUIUtil.AMOUNT_DECIMALS_WITH_ZEROS, true));
setGraphic(new ColoredDecimalPlacesWithZerosText(model.getAmount(item.totalAmount), GUIUtil.AMOUNT_DECIMALS_WITH_ZEROS));
else {
setText("");
setGraphic(null);