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

fix issues when removing selected items from utxotreetable

Browse source
This commit is contained in:
Craig Raw 2021-09-27 11:46:50 +02:00
parent 86a49e0d9a
commit a934ffa76c
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/com/sparrowwallet/sparrow/wallet/UtxosController.java
View file

@ -30,6 +30,7 @@ import javafx.fxml.FXML;
import javafx.fxml.Initializable; import javafx.fxml.Initializable;
import javafx.scene.control.Button; import javafx.scene.control.Button;
import javafx.scene.control.Tooltip; import javafx.scene.control.Tooltip;
import javafx.scene.control.TreeItem;
import javafx.scene.layout.HBox; import javafx.scene.layout.HBox;
import javafx.stage.FileChooser; import javafx.stage.FileChooser;
import javafx.stage.Stage; import javafx.stage.Stage;
@ -192,7 +193,9 @@ public class UtxosController extends WalletFormController implements Initializab
} }
private List<Entry> getSelectedEntries() { private List<Entry> getSelectedEntries() {
return utxosTable.getSelectionModel().getSelectedCells().stream().map(tp -> (UtxoEntry)tp.getTreeItem().getValue()) return utxosTable.getSelectionModel().getSelectedCells().stream()
.filter(tp -> tp.getTreeItem() != null)
.map(tp -> (UtxoEntry)tp.getTreeItem().getValue())
.filter(utxoEntry -> utxoEntry.isSpendable() && !utxoEntry.isMixing()) .filter(utxoEntry -> utxoEntry.isSpendable() && !utxoEntry.isMixing())
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
@ -445,9 +448,15 @@ public class UtxosController extends WalletFormController implements Initializab
if(event.getWallet().equals(walletForm.getWallet())) { if(event.getWallet().equals(walletForm.getWallet())) {
WalletUtxosEntry walletUtxosEntry = getWalletForm().getWalletUtxosEntry(); WalletUtxosEntry walletUtxosEntry = getWalletForm().getWalletUtxosEntry();
List<Entry> selectedEntries = utxosTable.getSelectionModel().getSelectedItems().stream().map(TreeItem::getValue).filter(Objects::nonNull).toList();
//Will automatically update utxosTable //Will automatically update utxosTable
walletUtxosEntry.updateUtxos(); walletUtxosEntry.updateUtxos();
if(!walletUtxosEntry.getChildren().containsAll(selectedEntries)) {
utxosTable.getSelectionModel().clearSelection();
}
utxosTable.updateHistory(event.getHistoryChangedNodes()); utxosTable.updateHistory(event.getHistoryChangedNodes());
utxosChart.update(walletUtxosEntry); utxosChart.update(walletUtxosEntry);
} }