sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-24 12:46:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

followup

Browse source
This commit is contained in:
Craig Raw 2022-02-02 16:34:12 +02:00
parent ca928fc136
commit 5fa048d242
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/com/sparrowwallet/sparrow/control/TransactionDiagram.java
View file

@ -373,13 +373,15 @@ public class TransactionDiagram extends GridPane {
inputsBox.minHeightProperty().bind(minHeightProperty()); inputsBox.minHeightProperty().bind(minHeightProperty());
inputsBox.setAlignment(Pos.CENTER_RIGHT); inputsBox.setAlignment(Pos.CENTER_RIGHT);
inputsBox.getChildren().add(createSpacer()); inputsBox.getChildren().add(createSpacer());
double labelHeight = TextUtils.computeTextHeight(AppServices.getMonospaceFont(), "0") + 1; Label helper = new Label();
double labelHeight = Math.max(TextUtils.computeTextHeight(AppServices.getMonospaceFont(), "0"), TextUtils.computeTextHeight(helper.getFont(), "0")) + 1;
for(Map<BlockTransactionHashIndex, WalletNode> displayedUtxos : displayedUtxoSets) { for(Map<BlockTransactionHashIndex, WalletNode> displayedUtxos : displayedUtxoSets) {
for(BlockTransactionHashIndex input : displayedUtxos.keySet()) { for(BlockTransactionHashIndex input : displayedUtxos.keySet()) {
WalletNode walletNode = displayedUtxos.get(input); WalletNode walletNode = displayedUtxos.get(input);
String desc = getInputDescription(input); String desc = getInputDescription(input);
Label label = new Label(desc); Label label = new Label(desc);
label.setPrefHeight(labelHeight); label.setPrefHeight(labelHeight);
label.setAlignment(Pos.BASELINE_LEFT);
label.getStyleClass().add("utxo-label"); label.getStyleClass().add("utxo-label");
Button excludeUtxoButton = new Button(""); Button excludeUtxoButton = new Button("");
@ -446,12 +448,16 @@ public class TransactionDiagram extends GridPane {
inputBox.setAlignment(Pos.CENTER_RIGHT); inputBox.setAlignment(Pos.CENTER_RIGHT);
inputBox.getChildren().add(label); inputBox.getChildren().add(label);
if(isExpanded() && inputValue != null) { if(isExpanded()) {
label.setMinWidth(120); label.setMinWidth(120);
Region region = new Region(); Region region = new Region();
HBox.setHgrow(region, Priority.ALWAYS); HBox.setHgrow(region, Priority.ALWAYS);
CoinLabel amountLabel = new CoinLabel(); CoinLabel amountLabel = new CoinLabel();
amountLabel.setValue(inputValue); if(inputValue != null) {
amountLabel.setValue(inputValue);
} else if(label.getText().trim().isEmpty()) {
amountLabel.setText("");
}
amountLabel.setMinWidth(TextUtils.computeTextWidth(amountLabel.getFont(), amountLabel.getText(), 0.0D) + 2); amountLabel.setMinWidth(TextUtils.computeTextWidth(amountLabel.getFont(), amountLabel.getText(), 0.0D) + 2);
inputBox.getChildren().addAll(region, amountLabel); inputBox.getChildren().addAll(region, amountLabel);
} }
@ -609,7 +615,7 @@ public class TransactionDiagram extends GridPane {
outputsBox.setMaxWidth(isExpanded() ? 350 : 150); outputsBox.setMaxWidth(isExpanded() ? 350 : 150);
outputsBox.setPrefWidth(isExpanded() ? 230 : 150); outputsBox.setPrefWidth(isExpanded() ? 230 : 150);
outputsBox.setPadding(new Insets(0, 20, 0, 10)); outputsBox.setPadding(new Insets(0, 20, 0, 10));
outputsBox.setAlignment(Pos.CENTER_LEFT); outputsBox.setAlignment(Pos.BASELINE_LEFT);
outputsBox.getChildren().add(createSpacer()); outputsBox.getChildren().add(createSpacer());
List<OutputNode> outputNodes = new ArrayList<>(); List<OutputNode> outputNodes = new ArrayList<>();