Skip to content

Commit

Permalink
Merge pull request #4718 from jmacxx/fix_issue_4708
Browse files Browse the repository at this point in the history
Cleanup user interface elements in Send Funds screen
  • Loading branch information
ripcurlx authored Oct 28, 2020
2 parents 9a87137 + a5c62a5 commit 50ab428
Showing 1 changed file with 3 additions and 5 deletions.
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

0 comments on commit 50ab428

Please sign in to comment.