From b3c92617c92590206a1b2ad153b94c2dff51f83f Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Wed, 21 May 2025 10:05:58 +0200 Subject: [PATCH] minor fixes on recent blocks view --- .../java/com/sparrowwallet/sparrow/control/BlockCube.java | 3 ++- .../com/sparrowwallet/sparrow/control/RecentBlocksView.java | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/sparrowwallet/sparrow/control/BlockCube.java b/src/main/java/com/sparrowwallet/sparrow/control/BlockCube.java index 25e40beb..d02e449c 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/BlockCube.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/BlockCube.java @@ -62,8 +62,9 @@ public class BlockCube extends Group { this.medianFeeProperty.addListener((_, _, newValue) -> { medianFeeText.setText(newValue.doubleValue() < 0.0d ? "" : "~" + Math.round(Math.max(newValue.doubleValue(), 1.0d))); unitsText.setText(newValue.doubleValue() < 0.0d ? "" : " s/vb"); + double medianFeeWidth = TextUtils.computeTextWidth(medianFeeText.getFont(), medianFeeText.getText(), 0.0d); double unitsWidth = TextUtils.computeTextWidth(unitsText.getFont(), unitsText.getText(), 0.0d); - medianFeeTextFlow.setTranslateX((CUBE_SIZE - (medianFeeText.getLayoutBounds().getWidth() + unitsWidth)) / 2); + medianFeeTextFlow.setTranslateX((CUBE_SIZE - (medianFeeWidth + unitsWidth)) / 2); }); this.txCountProperty.addListener((_, _, newValue) -> { txCountText.setText(newValue.intValue() == 0 ? "" : newValue + " txes"); diff --git a/src/main/java/com/sparrowwallet/sparrow/control/RecentBlocksView.java b/src/main/java/com/sparrowwallet/sparrow/control/RecentBlocksView.java index 38bb07ef..19823440 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/RecentBlocksView.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/RecentBlocksView.java @@ -91,12 +91,12 @@ public class RecentBlocksView extends Pane { } else { for(int i = 1; i < getCubes().size() && i < latestBlocks.size(); i++) { BlockCube blockCube = getCubes().get(i); - BlockSummary latestBlock = latestBlocks.get(i); + BlockSummary latestBlock = latestBlocks.get(i-1); blockCube.setConfirmed(true); blockCube.setHeight(latestBlock.getHeight()); blockCube.setTimestamp(latestBlock.getTimestamp().getTime()); blockCube.setWeight(latestBlock.getWeight().orElse(0)); - blockCube.setMedianFee(latestBlock.getMedianFee().orElse(0.0d)); + blockCube.setMedianFee(latestBlock.getMedianFee().orElse(-1.0d)); blockCube.setTxCount(latestBlock.getTransactionCount().orElse(0)); } updateFeeRate(currentFeeRate); @@ -116,7 +116,7 @@ public class RecentBlocksView extends Pane { blockCube.setHeight(latestBlock.getHeight()); blockCube.setTimestamp(latestBlock.getTimestamp().getTime()); blockCube.setWeight(latestBlock.getWeight().orElse(0)); - blockCube.setMedianFee(latestBlock.getMedianFee().orElse(0.0d)); + blockCube.setMedianFee(latestBlock.getMedianFee().orElse(-1.0d)); blockCube.setTxCount(latestBlock.getTransactionCount().orElse(0)); }