Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make all DAO screen tables resize to max. screen height #3823

Merged
merged 1 commit into from
Jan 2, 2020
Merged

Make all DAO screen tables resize to max. screen height #3823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions desktop/src/main/java/bisq/desktop/main/dao/burnbsq/assetfee/AssetFeeView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions desktop/src/main/java/bisq/desktop/main/dao/burnbsq/proofofburn/ProofOfBurnView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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();
}

Expand Down Expand Up @@ -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() {
Expand Down
7 changes: 6 additions & 1 deletion desktop/src/main/java/bisq/desktop/main/dao/governance/result/VoteResultView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());


Comment on lines +469 to +470
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Unnecessary new lines

}


Expand All @@ -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);
Expand All @@ -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);
}

///////////////////////////////////////////////////////////////////////////////////////////
Expand Down