From 86ef129c1b81a28a92aafbd2e1e02941add7dcd0 Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Wed, 15 Dec 2021 14:28:31 +0200 Subject: [PATCH] follow up for theming --- .../com/sparrowwallet/sparrow/control/TransactionDiagram.java | 2 ++ src/main/resources/com/sparrowwallet/sparrow/darktheme.css | 4 ++++ src/main/resources/com/sparrowwallet/sparrow/wallet/send.css | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/src/main/java/com/sparrowwallet/sparrow/control/TransactionDiagram.java b/src/main/java/com/sparrowwallet/sparrow/control/TransactionDiagram.java index 695a7be5..edc2a4ea 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/TransactionDiagram.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/TransactionDiagram.java @@ -419,6 +419,7 @@ public class TransactionDiagram extends GridPane { if(sum > 0 && !curve.getStyleClass().contains("input-dashed-line")) { long radius = Math.round((double)inputs.get(numUtxos-i).getValue() * (RELATIVE_SIZE_MAX_RADIUS - 1) / sum) + 1; Circle circle = new Circle(curve.getStartX(), curve.getStartY(), radius); + circle.getStyleClass().add("size-indicator"); group.getChildren().add(circle); } } @@ -493,6 +494,7 @@ public class TransactionDiagram extends GridPane { if(sum > 0) { long radius = Math.min(RELATIVE_SIZE_MAX_RADIUS, Math.round((double)values.get(numOutputs-i) * (RELATIVE_SIZE_MAX_RADIUS - 1) / sum) + 1); Circle circle = new Circle(curve.getEndX(), curve.getEndY(), radius); + circle.getStyleClass().add("size-indicator"); group.getChildren().add(circle); } } diff --git a/src/main/resources/com/sparrowwallet/sparrow/darktheme.css b/src/main/resources/com/sparrowwallet/sparrow/darktheme.css index 6630f575..e06b3884 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/darktheme.css +++ b/src/main/resources/com/sparrowwallet/sparrow/darktheme.css @@ -210,6 +210,10 @@ -fx-text-fill: lightgray; } +.root #transactionDiagram .size-indicator { + -fx-fill: lightgray; +} + .root .progress-indicator.progress-timer.warn > .determinate-indicator > .indicator { -fx-background-color: -fx-box-border, radial-gradient(center 50% 50%, radius 50%, #e06c75 70%, derive(-fx-control-inner-background, -9%) 100%); } \ No newline at end of file diff --git a/src/main/resources/com/sparrowwallet/sparrow/wallet/send.css b/src/main/resources/com/sparrowwallet/sparrow/wallet/send.css index 874164e6..3c3e8280 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/wallet/send.css +++ b/src/main/resources/com/sparrowwallet/sparrow/wallet/send.css @@ -85,6 +85,10 @@ -fx-stroke-width: 1px; } +#transactionDiagram .size-indicator { + -fx-fill: -fx-text-base-color; +} + #transactionDiagram .input-dashed-line { -fx-stroke-dash-array: 5px 5px; }