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

Jump to bottom

Cleanup user interface elements in Send Funds screen #4718

Merged
merged 1 commit into from Oct 28, 2020
Merged

Cleanup user interface elements in Send Funds screen #4718

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
8 changes: 3 additions & 5 deletions desktop/src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public class WithdrawalView extends ActivatableView<VBox, Void> {
@FXML
TableColumn<WithdrawalListItem, WithdrawalListItem> addressColumn, balanceColumn, selectColumn;

private RadioButton useAllInputsRadioButton, useCustomInputsRadioButton, feeExcludedRadioButton;
private RadioButton useAllInputsRadioButton, useCustomInputsRadioButton, feeExcludedRadioButton, feeIncludedRadioButton;
private Label amountLabel;
private TextField amountTextField, withdrawFromTextField, withdrawToTextField, withdrawMemoTextField;

Expand Down Expand Up @@ -209,18 +209,16 @@ public void initialize() {
amountTextField = feeTuple3.second;
amountTextField.setMinWidth(180);
feeExcludedRadioButton = feeTuple3.third;
RadioButton feeIncludedRadioButton = feeTuple3.fourth;
feeIncludedRadioButton = feeTuple3.fourth;

withdrawFromTextField = addTopLabelTextField(gridPane, ++rowIndex,
Res.get("funds.withdrawal.fromLabel", Res.getBaseCurrencyCode())).second;

withdrawToTextField = addTopLabelInputTextField(gridPane, ++rowIndex,
Res.get("funds.withdrawal.toLabel", Res.getBaseCurrencyCode())).second;
withdrawToTextField.setMaxWidth(380);

withdrawMemoTextField = addTopLabelInputTextField(gridPane, ++rowIndex,
Res.get("funds.withdrawal.memoLabel", Res.getBaseCurrencyCode())).second;
withdrawMemoTextField.setMaxWidth(380);

final Button withdrawButton = addButton(gridPane, ++rowIndex, Res.get("funds.withdrawal.withdrawButton"), 15);

Expand Down Expand Up @@ -300,7 +298,7 @@ protected void activate() {
inputsToggleGroup.selectedToggleProperty().addListener(inputsToggleGroupListener);

if (feeToggleGroup.getSelectedToggle() == null)
feeToggleGroup.selectToggle(feeExcludedRadioButton);
feeToggleGroup.selectToggle(feeIncludedRadioButton);

if (inputsToggleGroup.getSelectedToggle() == null)
inputsToggleGroup.selectToggle(useAllInputsRadioButton);
Expand Down