mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 18:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove setFitToRowsForTableView, update merit at activate

Browse Source
This commit is contained in:
Manfred Karrer 2019-03-29 16:44:34 -05:00
parent 30059ebb44
commit 995844feb3
No known key found for this signature in database
GPG Key ID: 401250966A6B2C46
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
desktop/src/main/java/bisq/desktop/main/dao/governance/proposals/ProposalsView.java
View File

@ -54,6 +54,7 @@ import bisq.core.user.Preferences;
import bisq.core.util.BSFormatter;
import bisq.core.util.BsqFormatter;
import bisq.common.UserThread;
import bisq.common.app.DevEnv;
import bisq.common.util.Tuple2;
import bisq.common.util.Tuple3;
@ -148,7 +149,7 @@ public class ProposalsView extends ActivatableView<GridPane, Void> implements Bs
int extraRows = screenSize <= INITIAL_WINDOW_HEIGHT ? 0 : (int) ((screenSize - INITIAL_WINDOW_HEIGHT) / pixelsPerProposalTableRow);
return extraRows == 0 ? initialProposalTableViewHeight : Math.ceil(initialProposalTableViewHeight + (extraRows * pixelsPerProposalTableRow));
};
private ChangeListener<Number> bisqWindowVerticalSizeListener;
private ChangeListener<Number> sceneHeightListener;
private TableGroupHeadline proposalsHeadline;
@ -187,14 +188,7 @@ public class ProposalsView extends ActivatableView<GridPane, Void> implements Bs
ballotListChangeListener = c -> updateListItems();
proposalListChangeListener = c -> updateListItems();
bisqWindowVerticalSizeListener = (observable, oldValue, newValue) -> {
double newTableViewHeight = proposalTableViewHeight.apply(newValue.doubleValue());
if (tableView.getHeight() != newTableViewHeight) {
tableView.setMinHeight(newTableViewHeight);
double diff = newTableViewHeight - tableView.getHeight();
proposalsHeadline.setMaxHeight(proposalsHeadline.getHeight() + diff);
}
};
sceneHeightListener = (observable, oldValue, newValue) -> updateTableHeight(newValue.doubleValue());
stakeListener = (observable, oldValue, newValue) -> updateViews();
}
@ -225,10 +219,14 @@ public class ProposalsView extends ActivatableView<GridPane, Void> implements Bs
bsqWalletService.getUnlockingBondsBalance());
updateListItems();
GUIUtil.setFitToRowsForTableView(tableView, 38, 28, 4, 4);
tableView.setPrefHeight(100);
updateViews();
root.getScene().heightProperty().addListener(bisqWindowVerticalSizeListener);
updateListItems();
applyMerit();
root.getScene().heightProperty().addListener(sceneHeightListener);
UserThread.execute(() -> updateTableHeight(root.getScene().getHeight()));
}
@Override
@ -591,6 +589,15 @@ public class ProposalsView extends ActivatableView<GridPane, Void> implements Bs
return daoFacade.isInPhaseButNotLastBlock(DaoPhase.Phase.BLIND_VOTE);
}
private void updateTableHeight(double height) {
double newTableViewHeight = proposalTableViewHeight.apply(height);
if (tableView.getHeight() != newTableViewHeight) {
tableView.setMinHeight(newTableViewHeight);
double diff = newTableViewHeight - tableView.getHeight();
proposalsHeadline.setMaxHeight(proposalsHeadline.getHeight() + diff);
}
}
///////////////////////////////////////////////////////////////////////////////////////////
// Create views