Merge pull request #3823 from chimp1984/fix-dao-tables-resizing

Make all DAO screen tables resize to max. screen height
bisq-network · Jan 2, 2020 · 91774c6 · 91774c6
2 parents 3a74e74 + 3781eb0
commit 91774c6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/desktop/src/main/java/bisq/desktop/main/dao/burnbsq/assetfee/AssetFeeView.java b/desktop/src/main/java/bisq/desktop/main/dao/burnbsq/assetfee/AssetFeeView.java
@@ -35,8 +35,8 @@
 import bisq.core.locale.CurrencyUtil;
 import bisq.core.locale.Res;
 import bisq.core.util.FormattingUtils;
-import bisq.core.util.coin.BsqFormatter;
 import bisq.core.util.ParsingUtils;
+import bisq.core.util.coin.BsqFormatter;
 import bisq.core.util.coin.CoinFormatter;
 
 import bisq.common.app.DevEnv;
@@ -195,7 +195,7 @@ protected void activate() {
         });
 
         updateList();
-        GUIUtil.setFitToRowsForTableView(tableView, 41, 28, 2, 10);
+        GUIUtil.setFitToRowsForTableView(tableView, 41, 28, 2, 100);
         updateButtonState();
 
         feeAmountInputTextField.resetValidation();
@@ -273,7 +273,7 @@ private void updateList() {
                 .map(statefulAsset -> new AssetListItem(statefulAsset, bsqFormatter))
                 /*.sorted(Comparator.comparing(AssetListItem::getNameAndCode))*/
                 .collect(Collectors.toList()));
-        GUIUtil.setFitToRowsForTableView(tableView, 41, 28, 2, 10);
+        GUIUtil.setFitToRowsForTableView(tableView, 41, 28, 2, 100);
     }
 
     private void updateButtonState() {

diff --git a/desktop/src/main/java/bisq/desktop/main/dao/burnbsq/proofofburn/ProofOfBurnView.java b/desktop/src/main/java/bisq/desktop/main/dao/burnbsq/proofofburn/ProofOfBurnView.java
@@ -38,8 +38,8 @@
 import bisq.core.locale.Res;
 import bisq.core.user.Preferences;
 import bisq.core.util.FormattingUtils;
-import bisq.core.util.coin.BsqFormatter;
 import bisq.core.util.ParsingUtils;
+import bisq.core.util.coin.BsqFormatter;
 import bisq.core.util.coin.CoinFormatter;
 import bisq.core.util.validation.InputValidator;
 
@@ -191,7 +191,7 @@ protected void activate() {
 
         updateList();
         GUIUtil.setFitToRowsForTableView(myItemsTableView, 41, 28, 2, 4);
-        GUIUtil.setFitToRowsForTableView(allTxsTableView, 41, 28, 2, 10);
+        GUIUtil.setFitToRowsForTableView(allTxsTableView, 41, 28, 2, 100);
         updateButtonState();
     }
 
@@ -271,7 +271,7 @@ private void updateList() {
         allItemsObservableList.setAll(proofOfBurnService.getProofOfBurnTxList().stream()
                 .map(tx -> new ProofOfBurnListItem(tx, proofOfBurnService, bsqFormatter))
                 .collect(Collectors.toList()));
-        GUIUtil.setFitToRowsForTableView(allTxsTableView, 41, 28, 2, 10);
+        GUIUtil.setFitToRowsForTableView(allTxsTableView, 41, 28, 2, 100);
     }
 
     private void updateButtonState() {

diff --git a/desktop/src/main/java/bisq/desktop/main/dao/governance/result/VoteResultView.java b/desktop/src/main/java/bisq/desktop/main/dao/governance/result/VoteResultView.java
@@ -85,6 +85,7 @@
 import javafx.scene.control.TextArea;
 import javafx.scene.control.Tooltip;
 import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Priority;
 
 import javafx.geometry.HPos;
 import javafx.geometry.Insets;
@@ -460,10 +461,13 @@ private void createCyclesTable() {
         GridPane.setRowIndex(cyclesTableView, gridRow);
         GridPane.setMargin(cyclesTableView, new Insets(Layout.FIRST_ROW_AND_GROUP_DISTANCE, -10, -15, -10));
         GridPane.setColumnSpan(cyclesTableView, 2);
+        GridPane.setVgrow(cyclesTableView, Priority.SOMETIMES);
         root.getChildren().add(cyclesTableView);
 
         cyclesTableView.setItems(sortedCycleListItemList);
         sortedCycleListItemList.comparatorProperty().bind(cyclesTableView.comparatorProperty());
+
+
     }
 
 
@@ -487,6 +491,7 @@ private void createProposalsTable() {
         GridPane.setRowIndex(proposalsTableView, gridRow);
         GridPane.setMargin(proposalsTableView, new Insets(Layout.FIRST_ROW_AND_GROUP_DISTANCE, -10, 0, -10));
         GridPane.setColumnSpan(proposalsTableView, 2);
+        GridPane.setVgrow(proposalsTableView, Priority.ALWAYS);
         root.getChildren().add(proposalsTableView);
 
         proposalsTableView.setItems(sortedProposalList);
@@ -513,7 +518,7 @@ private void createProposalsTable() {
                         isVoteIncludedInResult,
                         bsqFormatter))
                 .collect(Collectors.toList()));
-        GUIUtil.setFitToRowsForTableView(proposalsTableView, 25, 28, 6, 6);
+        GUIUtil.setFitToRowsForTableView(proposalsTableView, 25, 28, 6, 100);
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////