Skip to content

Commit 49573d1

Browse files
committed
upgrade to javafx 22 with a minimum requirement of macos 11 and gtk3
1 parent 17093db commit 49573d1

15 files changed

+24
-27
lines changed

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ tasks.withType(AbstractArchiveTask) {
5353
}
5454

5555
javafx {
56-
version = "18"
56+
version = headless ? "18" : "22"
5757
modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.swing', 'javafx.graphics' ]
5858
}
5959

src/main/java/com/sparrowwallet/sparrow/control/AddressTreeTable.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void initialize(NodeEntry rootEntry) {
7777
getColumns().forEach(col -> col.setContextMenu(contextMenu));
7878

7979
setEditable(true);
80-
setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY);
80+
setEqualPreferredColumnWidths();
8181

8282
addressCol.setSortType(TreeTableColumn.SortType.ASCENDING);
8383
getSortOrder().add(addressCol);

src/main/java/com/sparrowwallet/sparrow/control/CoinTreeTable.java

+9
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public class CoinTreeTable extends TreeTableView<Entry> {
3131
private BitcoinUnit bitcoinUnit;
3232
private UnitFormat unitFormat;
3333
private CurrencyRate currencyRate;
34+
protected static final double STANDARD_WIDTH = 100.0;
3435

3536
public BitcoinUnit getBitcoinUnit() {
3637
return bitcoinUnit;
@@ -143,4 +144,12 @@ public void setSortColumn(int columnIndex, TreeTableColumn.SortType sortType) {
143144
getSortOrder().add(column);
144145
}
145146
}
147+
148+
@SuppressWarnings("deprecation")
149+
protected void setEqualPreferredColumnWidths() {
150+
for(TreeTableColumn<?, ?> column : getColumns()) {
151+
column.setPrefWidth(STANDARD_WIDTH);
152+
}
153+
setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY);
154+
}
146155
}

src/main/java/com/sparrowwallet/sparrow/control/EntryCell.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -841,7 +841,7 @@ public static void applyRowStyles(TreeTableCell<?, ?> cell, Entry entry) {
841841
}
842842
} else if(entry instanceof WalletSummaryDialog.UnconfirmedEntry) {
843843
cell.getStyleClass().add("unconfirmed-row");
844-
} else if(entry instanceof WalletSummaryDialog.SummaryEntry) {
844+
} else if(entry instanceof WalletSummaryDialog.SummaryEntry || entry instanceof WalletSummaryDialog.AllSummaryEntry) {
845845
cell.getStyleClass().add("summary-row");
846846
}
847847
}

src/main/java/com/sparrowwallet/sparrow/control/SearchWalletDialog.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public SearchWalletDialog(List<WalletForm> walletForms) {
8989
results.setShowRoot(false);
9090
results.setPrefWidth(showWallet || showAccount ? 950 : 850);
9191
results.setUnitFormat(walletForms.iterator().next().getWallet());
92-
results.setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY);
92+
results.setEqualPreferredColumnWidths();
9393
results.setPlaceholder(new Label("No results"));
9494
results.setEditable(true);
9595

src/main/java/com/sparrowwallet/sparrow/control/TransactionsTreeTable.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void initialize(WalletTransactionsEntry rootEntry) {
4949

5050
setPlaceholder(getDefaultPlaceholder(rootEntry.getWallet()));
5151
setEditable(true);
52-
setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY);
52+
setEqualPreferredColumnWidths();
5353
setSortColumn(0, TreeTableColumn.SortType.DESCENDING);
5454
}
5555

src/main/java/com/sparrowwallet/sparrow/control/UtxosTreeTable.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public void initialize(WalletUtxosEntry rootEntry) {
8282

8383
setPlaceholder(getDefaultPlaceholder(rootEntry.getWallet()));
8484
setEditable(true);
85-
setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY);
85+
setEqualPreferredColumnWidths();
8686
setSortColumn(getColumns().size() - 1, TreeTableColumn.SortType.DESCENDING);
8787

8888
getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);

src/main/java/com/sparrowwallet/sparrow/control/WalletSummaryDialog.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public WalletSummaryDialog(List<List<WalletForm>> summaryWalletFormsList) {
101101
table.setRoot(rootItem);
102102
rootItem.setExpanded(true);
103103

104-
table.setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY);
104+
table.setEqualPreferredColumnWidths();
105105
table.setPrefWidth(450);
106106

107107
VBox vBox = new VBox();

src/main/java/com/sparrowwallet/sparrow/preferences/ServerAliasDialog.java

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public class ServerAliasDialog extends Dialog<Server> {
2828
private final TableView<ServerEntry> serverTable;
2929
private final Button closeButton;
3030

31+
@SuppressWarnings("deprecation")
3132
public ServerAliasDialog(ServerType serverType) {
3233
this.serverType = serverType;
3334

src/main/resources/com/sparrowwallet/sparrow/darktheme.css

-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@
1616
-fx-prompt-text-fill: gray;
1717
}
1818

19-
.titulo{
20-
-fx-font-weight: bold;
21-
-fx-font-size: 18px;
22-
}
23-
2419
.button{
2520
-fx-focus-traversable: false;
2621
}

src/main/resources/com/sparrowwallet/sparrow/general.css

+5-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@
3636
-fx-padding: 3 5;
3737
}
3838

39+
.form .fieldset .legend, .table-view .column-header, .tree-table-view .column-header, VerticalHeader > Label {
40+
-fx-font-weight: normal;
41+
}
42+
3943
.form .fieldset.header .legend {
4044
-fx-padding: 0 0 15px 0;
4145
}
@@ -247,7 +251,7 @@
247251
}
248252

249253
.number-field {
250-
-fx-font-family: 'Helvetica Neue', 'System Regular';
254+
-fx-font-family: 'Helvetica Neue Regular', 'System Regular';
251255
}
252256

253257
VerticalHeader > Label.selected {

src/main/resources/com/sparrowwallet/sparrow/paynym/paynym.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
}
5151

5252
.listview-label {
53-
-fx-font-weight: bold;
53+
-fx-font-weight: normal;
5454
-fx-font-size: 1.2em;
5555
-fx-padding: 10 0 10 0;
5656
}
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.addresses-treetable-label {
2-
-fx-font-weight: bold;
2+
-fx-font-weight: normal;
33
-fx-font-size: 1.2em;
44
-fx-padding: 10 0 10 0;
55
}

src/main/resources/com/sparrowwallet/sparrow/wallet/transactions.css

-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
.transactions-treetable-label {
2-
-fx-font-weight: bold;
3-
-fx-font-size: 1.2em;
4-
-fx-padding: 10 0 10 0;
5-
}
6-
71
#balanceChart {
82
-fx-padding: 10 0 0 0;
93
-fx-max-width: 350px;

src/main/resources/com/sparrowwallet/sparrow/wallet/utxos.css

-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
.utxos-treetable-label {
2-
-fx-font-weight: bold;
3-
-fx-font-size: 1.2em;
4-
-fx-padding: 10 0 10 0;
5-
}
6-
71
.utxos-treetable .progress-bar > .bar {
82
-fx-padding: 0.6em;
93
}

0 commit comments

Comments
 (0)