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 with subtabs in new wallets

Browse source
This commit is contained in:
Craig Raw 2021-08-23 17:27:30 +02:00
parent f5ac6a3b73
commit d1ab1db1c5
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/com/sparrowwallet/sparrow/AppController.java
View file

@ -1188,7 +1188,7 @@ public class AppController implements Initializable {
TabPane subTabs = new TabPane(); TabPane subTabs = new TabPane();
subTabs.setSide(Side.RIGHT); subTabs.setSide(Side.RIGHT);
subTabs.getStyleClass().addAll("master-only", "wallet-subtabs"); subTabs.getStyleClass().add("master-only");
subTabs.rotateGraphicProperty().set(true); subTabs.rotateGraphicProperty().set(true);
tab.setContent(subTabs); tab.setContent(subTabs);
@ -1218,7 +1218,13 @@ public class AppController implements Initializable {
if(walletTabData.getWallet() == wallet.getMasterWallet()) { if(walletTabData.getWallet() == wallet.getMasterWallet()) {
TabPane subTabs = (TabPane)walletTab.getContent(); TabPane subTabs = (TabPane)walletTab.getContent();
addWalletSubTab(subTabs, storage, wallet, backupWallet); addWalletSubTab(subTabs, storage, wallet, backupWallet);
Platform.runLater(() -> subTabs.getStyleClass().remove("master-only")); Tab masterTab = subTabs.getTabs().get(0);
Label masterLabel = (Label)masterTab.getGraphic();
masterLabel.setText(getAutomaticName(wallet.getMasterWallet()));
Platform.runLater(() -> {
subTabs.getStyleClass().remove("master-only");
subTabs.getStyleClass().add("wallet-subtabs");
});
} }
} }
} }

2
src/main/java/com/sparrowwallet/sparrow/control/WalletImportDialog.java
View file

@ -48,7 +48,7 @@ public class WalletImportDialog extends Dialog<Wallet> {
AnchorPane.setRightAnchor(scrollPane, 0.0); AnchorPane.setRightAnchor(scrollPane, 0.0);
importAccordion = new Accordion(); importAccordion = new Accordion();
List<KeystoreFileImport> keystoreImporters = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new KeystoneSinglesig(), new PassportSinglesig(), new SeedSigner(), new SpecterDIY()); List<KeystoreFileImport> keystoreImporters = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new KeystoneSinglesig(), new PassportSinglesig(), new SpecterDIY());
for(KeystoreFileImport importer : keystoreImporters) { for(KeystoreFileImport importer : keystoreImporters) {
FileWalletKeystoreImportPane importPane = new FileWalletKeystoreImportPane(importer); FileWalletKeystoreImportPane importPane = new FileWalletKeystoreImportPane(importer);
importAccordion.getPanes().add(importPane); importAccordion.getPanes().add(importPane);