Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-12-16 08:14:15 -05:00
Code Issues Projects Releases Packages Wiki Activity

fix overlapping error message and floating label

Browse source
This commit is contained in:
woodser 2025-05-24 15:53:38 -04:00
parent 540ce08a4f
commit 62912c353c
No known key found for this signature in database
GPG key ID: 55A10DD48ADEE5EF
4 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
desktop/src/main/java/haveno/desktop/haveno.css
View file

@ -258,7 +258,7 @@
.jfx-combo-box.label-float:focused .prompt-container, .jfx-combo-box.label-float:focused .prompt-container,
.jfx-password-field.filled.label-float .prompt-container, .jfx-password-field.filled.label-float .prompt-container,
.jfx-password-field.label-float:focused .prompt-container { .jfx-password-field.label-float:focused .prompt-container {
-fx-translate-y: -6.5px; -fx-translate-y: -5.5px;
} }
.jfx-combo-box, .jfx-text-field, .jfx-text-area { .jfx-combo-box, .jfx-text-field, .jfx-text-area {
@ -2560,6 +2560,8 @@ textfield */
.input-with-border { .input-with-border {
-fx-border-width: 1; -fx-border-width: 1;
-fx-border-color: -bs-color-border-form-field; -fx-border-color: -bs-color-border-form-field;
-fx-border-insets: 1 0 1 0;
-fx-background-insets: 1 0 1 0;
} }
.table-view.non-interactive-table .column-header .label { .table-view.non-interactive-table .column-header .label {

12
desktop/src/main/java/haveno/desktop/main/settings/preferences/PreferencesView.java
View file

@ -102,7 +102,7 @@ import org.apache.commons.lang3.StringUtils;
@FxmlView @FxmlView
public class PreferencesView extends ActivatableViewAndModel<GridPane, PreferencesViewModel> { public class PreferencesView extends ActivatableViewAndModel<GridPane, PreferencesViewModel> {
private final User user; private final User user;
private TextField btcExplorerTextField; private TextField xmrExplorerTextField;
private ComboBox<String> userLanguageComboBox; private ComboBox<String> userLanguageComboBox;
private ComboBox<Country> userCountryComboBox; private ComboBox<Country> userCountryComboBox;
private ComboBox<TradeCurrency> preferredTradeCurrencyComboBox; private ComboBox<TradeCurrency> preferredTradeCurrencyComboBox;
@ -220,9 +220,9 @@ public class PreferencesView extends ActivatableViewAndModel<GridPane, Preferenc
userCountryComboBox.setButtonCell(GUIUtil.getComboBoxButtonCell(Res.get("shared.country"), userCountryComboBox, userCountryComboBox.setButtonCell(GUIUtil.getComboBoxButtonCell(Res.get("shared.country"), userCountryComboBox,
false)); false));
Tuple2<TextField, Button> btcExp = addTextFieldWithEditButton(root, ++gridRow, Res.get("setting.preferences.explorer")); Tuple2<TextField, Button> xmrExp = addTextFieldWithEditButton(root, ++gridRow, Res.get("setting.preferences.explorer"));
btcExplorerTextField = btcExp.first; xmrExplorerTextField = xmrExp.first;
editCustomBtcExplorer = btcExp.second; editCustomBtcExplorer = xmrExp.second;
// deviation // deviation
deviationInputTextField = addInputTextField(root, ++gridRow, deviationInputTextField = addInputTextField(root, ++gridRow,
@ -688,7 +688,7 @@ public class PreferencesView extends ActivatableViewAndModel<GridPane, Preferenc
} }
}); });
btcExplorerTextField.setText(preferences.getBlockChainExplorer().name); xmrExplorerTextField.setText(preferences.getBlockChainExplorer().name);
deviationInputTextField.setText(FormattingUtils.formatToPercentWithSymbol(preferences.getMaxPriceDistanceInPercent())); deviationInputTextField.setText(FormattingUtils.formatToPercentWithSymbol(preferences.getMaxPriceDistanceInPercent()));
deviationInputTextField.textProperty().addListener(deviationListener); deviationInputTextField.textProperty().addListener(deviationListener);
@ -779,7 +779,7 @@ public class PreferencesView extends ActivatableViewAndModel<GridPane, Preferenc
.actionButtonText(Res.get("shared.save")) .actionButtonText(Res.get("shared.save"))
.onAction(() -> { .onAction(() -> {
preferences.setBlockChainExplorer(urlWindow.getEditedBlockChainExplorer()); preferences.setBlockChainExplorer(urlWindow.getEditedBlockChainExplorer());
btcExplorerTextField.setText(preferences.getBlockChainExplorer().name); xmrExplorerTextField.setText(preferences.getBlockChainExplorer().name);
}) })
.closeButtonText(Res.get("shared.cancel")) .closeButtonText(Res.get("shared.cancel"))
.onClose(urlWindow::hide) .onClose(urlWindow::hide)

1
desktop/src/main/java/haveno/desktop/util/FormBuilder.java
View file

@ -387,6 +387,7 @@ public class FormBuilder {
hbox.setSpacing(8); hbox.setSpacing(8);
VBox vbox = getTopLabelVBox(0); VBox vbox = getTopLabelVBox(0);
vbox.setSpacing(2);
vbox.getChildren().addAll(getTopLabel(title), hbox); vbox.getChildren().addAll(getTopLabel(title), hbox);
gridPane.getChildren().add(vbox); gridPane.getChildren().add(vbox);

2
desktop/src/main/java/haveno/desktop/util/Layout.java
View file

@ -25,7 +25,7 @@ public class Layout {
public static final double FIRST_ROW_DISTANCE = 20d; public static final double FIRST_ROW_DISTANCE = 20d;
public static final double COMPACT_FIRST_ROW_DISTANCE = 10d; public static final double COMPACT_FIRST_ROW_DISTANCE = 10d;
public static final double TWICE_FIRST_ROW_DISTANCE = 20d * 2; public static final double TWICE_FIRST_ROW_DISTANCE = 20d * 2;
public static final double FLOATING_LABEL_DISTANCE = 18d; public static final double FLOATING_LABEL_DISTANCE = 23d;
public static final double GROUP_DISTANCE = 40d; public static final double GROUP_DISTANCE = 40d;
public static final double COMPACT_GROUP_DISTANCE = 30d; public static final double COMPACT_GROUP_DISTANCE = 30d;
public static final double GROUP_DISTANCE_WITHOUT_SEPARATOR = 20d; public static final double GROUP_DISTANCE_WITHOUT_SEPARATOR = 20d;