From 7e7d956f056fe8365be496d937a82c45bbe791a6 Mon Sep 17 00:00:00 2001 From: Florian Reimair Date: Tue, 13 Aug 2019 11:22:08 +0200 Subject: [PATCH 1/5] Dynamic list view size in accounts view --- .../src/main/java/bisq/desktop/main/account/AccountView.fxml | 2 ++ .../account/content/altcoinaccounts/AltCoinAccountsView.java | 1 - .../main/account/content/fiataccounts/FiatAccountsView.java | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/account/AccountView.fxml b/desktop/src/main/java/bisq/desktop/main/account/AccountView.fxml index d907efcbd4c..e7b9c5b0fed 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/AccountView.fxml +++ b/desktop/src/main/java/bisq/desktop/main/account/AccountView.fxml @@ -28,11 +28,13 @@ xmlns:fx="http://javafx.com/fxml"> diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.java b/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.java index c00bb275b54..7c397695130 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.java +++ b/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.java @@ -173,7 +173,6 @@ protected void buildForm() { Tuple3, VBox> tuple = addTopLabelListView(root, gridRow, Res.get("account.altcoin.yourAltcoinAccounts"), Layout.FIRST_ROW_DISTANCE); paymentAccountsListView = tuple.second; - paymentAccountsListView.setPrefHeight(2 * Layout.LIST_ROW_HEIGHT + 14); setPaymentAccountsCellFactory(); Tuple3 tuple3 = add3ButtonsAfterGroup(root, ++gridRow, Res.get("shared.addNewAccount"), diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java index ff10dec601b..8ae7ef149b8 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java +++ b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java @@ -320,7 +320,6 @@ protected void buildForm() { Tuple3, VBox> tuple = addTopLabelListView(root, gridRow, Res.get("account.fiat.yourFiatAccounts"), Layout.FIRST_ROW_DISTANCE); paymentAccountsListView = tuple.second; - paymentAccountsListView.setPrefHeight(2 * Layout.LIST_ROW_HEIGHT + 14); setPaymentAccountsCellFactory(); Tuple3 tuple3 = add3ButtonsAfterGroup(root, ++gridRow, Res.get("shared.addNewAccount"), From 637071c956bf82f61c2ed12e491e8b77dd025d9b Mon Sep 17 00:00:00 2001 From: Florian Reimair Date: Tue, 13 Aug 2019 11:44:44 +0200 Subject: [PATCH 2/5] Dynamic list view size in Dao network monitor view --- .../main/java/bisq/desktop/main/dao/monitor/MonitorView.fxml | 1 + .../java/bisq/desktop/main/dao/monitor/StateMonitorView.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop/src/main/java/bisq/desktop/main/dao/monitor/MonitorView.fxml b/desktop/src/main/java/bisq/desktop/main/dao/monitor/MonitorView.fxml index c0377d39c31..a2fa0e12ed2 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/monitor/MonitorView.fxml +++ b/desktop/src/main/java/bisq/desktop/main/dao/monitor/MonitorView.fxml @@ -27,6 +27,7 @@ AnchorPane.topAnchor="15"/> Date: Tue, 13 Aug 2019 12:07:39 +0200 Subject: [PATCH 3/5] Dynamic list view size for asset listing fee --- .../src/main/java/bisq/desktop/main/dao/burnbsq/BurnBsqView.fxml | 1 + 1 file changed, 1 insertion(+) diff --git a/desktop/src/main/java/bisq/desktop/main/dao/burnbsq/BurnBsqView.fxml b/desktop/src/main/java/bisq/desktop/main/dao/burnbsq/BurnBsqView.fxml index e582d9d817a..3a5230561f2 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/burnbsq/BurnBsqView.fxml +++ b/desktop/src/main/java/bisq/desktop/main/dao/burnbsq/BurnBsqView.fxml @@ -27,6 +27,7 @@ AnchorPane.topAnchor="15"/> Date: Tue, 13 Aug 2019 12:43:37 +0200 Subject: [PATCH 4/5] Dynamic list view sizes for DAO bonding tab --- .../main/java/bisq/desktop/main/dao/bonding/BondingView.fxml | 1 + .../java/bisq/desktop/main/dao/bonding/bonds/BondsView.java | 2 ++ .../desktop/main/dao/bonding/reputation/MyReputationView.java | 2 ++ .../java/bisq/desktop/main/dao/bonding/roles/RolesView.java | 3 ++- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/desktop/src/main/java/bisq/desktop/main/dao/bonding/BondingView.fxml b/desktop/src/main/java/bisq/desktop/main/dao/bonding/BondingView.fxml index e8aa70c1942..a4f49d59d32 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/bonding/BondingView.fxml +++ b/desktop/src/main/java/bisq/desktop/main/dao/bonding/BondingView.fxml @@ -27,6 +27,7 @@ AnchorPane.topAnchor="15"/> updateList(); diff --git a/desktop/src/main/java/bisq/desktop/main/dao/bonding/reputation/MyReputationView.java b/desktop/src/main/java/bisq/desktop/main/dao/bonding/reputation/MyReputationView.java index df699ae6b96..db30a5569fe 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/bonding/reputation/MyReputationView.java +++ b/desktop/src/main/java/bisq/desktop/main/dao/bonding/reputation/MyReputationView.java @@ -58,6 +58,7 @@ import javafx.scene.control.TableView; import javafx.scene.control.Tooltip; import javafx.scene.layout.GridPane; +import javafx.scene.layout.Priority; import javafx.beans.property.ReadOnlyObjectWrapper; import javafx.beans.value.ChangeListener; @@ -147,6 +148,7 @@ public void initialize() { tableView = FormBuilder.addTableViewWithHeader(root, ++gridRow, Res.get("dao.bond.reputation.table.header"), 20, "last"); createColumns(); tableView.setItems(sortedList); + GridPane.setVgrow(tableView, Priority.ALWAYS); createListeners(); } diff --git a/desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RolesView.java b/desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RolesView.java index f4949f72152..0e8c4078312 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RolesView.java +++ b/desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RolesView.java @@ -46,6 +46,7 @@ import javafx.scene.control.TableView; import javafx.scene.control.Tooltip; import javafx.scene.layout.GridPane; +import javafx.scene.layout.Priority; import javafx.beans.property.ReadOnlyObjectWrapper; @@ -96,7 +97,7 @@ public void initialize() { tableView = FormBuilder.addTableViewWithHeader(root, gridRow, Res.get("dao.bond.bondedRoles"), "last"); createColumns(); tableView.setItems(sortedList); - + GridPane.setVgrow(tableView, Priority.ALWAYS); bondedRoleListChangeListener = c -> updateList(); } From cb774176b7468a16aa6bef364b33ce7da933605e Mon Sep 17 00:00:00 2001 From: Florian Reimair Date: Wed, 14 Aug 2019 18:34:43 +0200 Subject: [PATCH 5/5] Add minheight to prevent truncation --- .../account/content/altcoinaccounts/AltCoinAccountsView.java | 1 + .../main/account/content/fiataccounts/FiatAccountsView.java | 1 + 2 files changed, 2 insertions(+) diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.java b/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.java index 7c397695130..ba0048bccdf 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.java +++ b/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.java @@ -173,6 +173,7 @@ protected void buildForm() { Tuple3, VBox> tuple = addTopLabelListView(root, gridRow, Res.get("account.altcoin.yourAltcoinAccounts"), Layout.FIRST_ROW_DISTANCE); paymentAccountsListView = tuple.second; + paymentAccountsListView.setMinHeight(2 * Layout.LIST_ROW_HEIGHT + 14); setPaymentAccountsCellFactory(); Tuple3 tuple3 = add3ButtonsAfterGroup(root, ++gridRow, Res.get("shared.addNewAccount"), diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java index 8ae7ef149b8..4edf7508d42 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java +++ b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java @@ -320,6 +320,7 @@ protected void buildForm() { Tuple3, VBox> tuple = addTopLabelListView(root, gridRow, Res.get("account.fiat.yourFiatAccounts"), Layout.FIRST_ROW_DISTANCE); paymentAccountsListView = tuple.second; + paymentAccountsListView.setMinHeight(2 * Layout.LIST_ROW_HEIGHT + 14); setPaymentAccountsCellFactory(); Tuple3 tuple3 = add3ButtonsAfterGroup(root, ++gridRow, Res.get("shared.addNewAccount"),