diff --git a/src/main/java/com/sparrowwallet/sparrow/AppController.java b/src/main/java/com/sparrowwallet/sparrow/AppController.java index 00ab0af3..64168bc9 100644 --- a/src/main/java/com/sparrowwallet/sparrow/AppController.java +++ b/src/main/java/com/sparrowwallet/sparrow/AppController.java @@ -90,6 +90,9 @@ public class AppController implements Initializable { public static final String TRYING_ANOTHER_SERVER_MESSAGE = "trying another server..."; public static final String JPACKAGE_APP_PATH = "jpackage.app-path"; + @FXML + private VBox rootBox; + @FXML private MenuItem saveTransaction; @@ -378,7 +381,7 @@ public class AppController implements Initializable { chunkAddresses.setSelected(Config.get().isChunkAddresses()); if(Config.get().isChunkAddresses()) { - rootStack.getStyleClass().add("chunk-addresses"); + rootBox.getStyleClass().add("chunk-addresses"); } hideEmptyUsedAddressesProperty.set(Config.get().isHideEmptyUsedAddresses()); hideEmptyUsedAddresses.selectedProperty().bindBidirectional(hideEmptyUsedAddressesProperty); @@ -957,10 +960,10 @@ public class AppController implements Initializable { public void chunkAddresses(ActionEvent event) { CheckMenuItem item = (CheckMenuItem)event.getSource(); Config.get().setChunkAddresses(item.isSelected()); - if(item.isSelected() && !rootStack.getStyleClass().contains("chunk-addresses")) { - rootStack.getStyleClass().add("chunk-addresses"); + if(item.isSelected() && !rootBox.getStyleClass().contains("chunk-addresses")) { + rootBox.getStyleClass().add("chunk-addresses"); } else { - rootStack.getStyleClass().remove("chunk-addresses"); + rootBox.getStyleClass().remove("chunk-addresses"); } } diff --git a/src/main/java/com/sparrowwallet/sparrow/AppServices.java b/src/main/java/com/sparrowwallet/sparrow/AppServices.java index 8c9ff60d..3f54cb21 100644 --- a/src/main/java/com/sparrowwallet/sparrow/AppServices.java +++ b/src/main/java/com/sparrowwallet/sparrow/AppServices.java @@ -887,8 +887,13 @@ public class AppServices { Stage stage = (Stage)window; stage.getIcons().add(getWindowIcon()); - if(stage.getScene() != null && Config.get().getTheme() == Theme.DARK) { - stage.getScene().getStylesheets().add(AppServices.class.getResource("darktheme.css").toExternalForm()); + if(stage.getScene() != null) { + if(Config.get().getTheme() == Theme.DARK) { + stage.getScene().getStylesheets().add(AppServices.class.getResource("darktheme.css").toExternalForm()); + } + if(Config.get().isChunkAddresses()) { + stage.getScene().getRoot().getStyleClass().add("chunk-addresses"); + } } } diff --git a/src/main/resources/com/sparrowwallet/sparrow/app.fxml b/src/main/resources/com/sparrowwallet/sparrow/app.fxml index 890a5734..2a731084 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/app.fxml +++ b/src/main/resources/com/sparrowwallet/sparrow/app.fxml @@ -11,7 +11,7 @@ - + diff --git a/src/main/resources/com/sparrowwallet/sparrow/darktheme.css b/src/main/resources/com/sparrowwallet/sparrow/darktheme.css index afa9d3cd..9ed4d8bf 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/darktheme.css +++ b/src/main/resources/com/sparrowwallet/sparrow/darktheme.css @@ -388,12 +388,12 @@ HorizontalHeaderColumn > TableColumnHeader.column-header.table-column{ -fx-fill: white; } -.root #rootStack.chunk-addresses .text-field .address-chunk.alternate, -.root #rootStack.chunk-addresses .label .address-chunk.alternate, -.root #rootStack.chunk-addresses .tree-table-view:focused .address-chunk.alternate { +.root.chunk-addresses .text-field .address-chunk.alternate, +.root.chunk-addresses .label .address-chunk.alternate, +.root.chunk-addresses .tree-table-view:focused .address-chunk.alternate { -fx-fill: derive(-fx-text-inner-color, -35%); } -.root #rootStack.chunk-addresses .tree-table-view .tree-table-row-cell:selected .address-chunk.alternate { +.root.chunk-addresses .tree-table-view .tree-table-row-cell:selected .address-chunk.alternate { -fx-fill: derive(-fx-selection-bar-text, -35%); } diff --git a/src/main/resources/com/sparrowwallet/sparrow/general.css b/src/main/resources/com/sparrowwallet/sparrow/general.css index edcbd077..6e16efe7 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/general.css +++ b/src/main/resources/com/sparrowwallet/sparrow/general.css @@ -350,20 +350,20 @@ CellView > .text-input.text-field { -fx-fill: white; } -#rootStack.chunk-addresses .text-field .address-chunk.alternate, -#rootStack.chunk-addresses .label .address-chunk.alternate, -#rootStack.chunk-addresses .tree-table-view:focused .address-chunk.alternate { +.chunk-addresses .text-field .address-chunk.alternate, +.chunk-addresses .label .address-chunk.alternate, +.chunk-addresses .tree-table-view:focused .address-chunk.alternate { -fx-fill: derive(-fx-text-inner-color, 70%); } -#rootStack.chunk-addresses .tooltip .address-chunk.alternate { +.chunk-addresses .tooltip .address-chunk.alternate { -fx-fill: derive(gray, 60%); } -#rootStack.chunk-addresses .tree-table-view:focused .tree-table-row-cell:selected .address-chunk.alternate { +.chunk-addresses .tree-table-view:focused .tree-table-row-cell:selected .address-chunk.alternate { -fx-fill: derive(-fx-selection-bar-text, -15%); } -#rootStack.chunk-addresses .tree-table-view .tree-table-row-cell:selected .address-chunk.alternate { +.chunk-addresses .tree-table-view .tree-table-row-cell:selected .address-chunk.alternate { -fx-fill: derive(-fx-selection-bar-text, 60%); }