Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-07-27 00:45:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

format wallet password inputs

Browse source
This commit is contained in:
woodser 2025-05-09 19:11:26 -04:00
parent 14404dfbd6
commit a6ca6ee518
No known key found for this signature in database
GPG key ID: 55A10DD48ADEE5EF
6 changed files with 24 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
desktop/src/main/java/haveno/desktop/components/HavenoTextField.java
View file

@ -8,7 +8,7 @@ public class HavenoTextField extends JFXTextField {
public HavenoTextField(String value) {
super(value);
GUIUtil.initFilledStyle(this);
GUIUtil.applyFilledStyle(this);
}
public HavenoTextField() {

2
desktop/src/main/java/haveno/desktop/components/InputTextField.java
View file

@ -68,7 +68,7 @@ public class InputTextField extends JFXTextField {
public InputTextField() {
super();
GUIUtil.initFilledStyle(this);
GUIUtil.applyFilledStyle(this);
getValidators().add(jfxValidationWrapper);

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

@ -238,7 +238,9 @@
.jfx-text-field.filled.label-float .prompt-container,
.jfx-text-field.label-float:focused .prompt-container,
.jfx-combo-box.filled.label-float .prompt-container,
.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.label-float:focused .prompt-container {
-fx-translate-y: -6.5px;
}
@ -416,7 +418,7 @@ tree-table-view:focused {
-fx-background-color: -bs-background-color;
-fx-background-radius: 3 3 0 0;
-jfx-focus-color: -bs-color-primary;
-fx-padding: 0.333333em 0.333333em 0.333333em 0.333333em;
-fx-padding: 7 18 7 18;
-fx-background-radius: 999;
-fx-border-radius: 999;
}

4
desktop/src/main/java/haveno/desktop/theme-light.css
View file

@ -140,7 +140,7 @@
-fx-image: url("../../images/logo_landscape_light.png");
}
/** In light mode, we want a border around all inputs. */
.jfx-combo-box, .jfx-text-field, .jfx-text-area {
/** All inputs have border in light mode. */
.jfx-combo-box, .jfx-text-field, .jfx-text-area, .jfx-password-field {
-fx-border-color: -bs-color-background-button-border;
}

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

@ -886,6 +886,8 @@ public class FormBuilder {
public static PasswordTextField addPasswordTextField(GridPane gridPane, int rowIndex, String title, double top) {
PasswordTextField passwordField = new PasswordTextField();
passwordField.getStyleClass().addAll("label-float");
GUIUtil.applyFilledStyle(passwordField);
passwordField.setPromptText(title);
GridPane.setRowIndex(passwordField, rowIndex);
GridPane.setColumnIndex(passwordField, 0);
@ -1232,7 +1234,7 @@ public class FormBuilder {
public static <T> ComboBox<T> addComboBox(GridPane gridPane, int rowIndex, int top) {
final JFXComboBox<T> comboBox = new JFXComboBox<>();
GUIUtil.initFilledStyle(comboBox);
GUIUtil.applyFilledStyle(comboBox);
GridPane.setRowIndex(comboBox, rowIndex);
GridPane.setMargin(comboBox, new Insets(top, 0, 0, 0));
@ -1269,7 +1271,7 @@ public class FormBuilder {
VBox vBox = getTopLabelVBox(top);
final JFXComboBox<T> comboBox = new JFXComboBox<>();
GUIUtil.initFilledStyle(comboBox);
GUIUtil.applyFilledStyle(comboBox);
comboBox.setPromptText(prompt);
comboBox.setPadding(new Insets(top, 0, 0, 12));
@ -1396,7 +1398,7 @@ public class FormBuilder {
public static <T> ComboBox<T> addComboBox(GridPane gridPane, int rowIndex, String title, double top) {
JFXComboBox<T> comboBox = new JFXComboBox<>();
GUIUtil.initFilledStyle(comboBox);
GUIUtil.applyFilledStyle(comboBox);
comboBox.setLabelFloat(true);
comboBox.getStyleClass().add("label-float");
comboBox.setPromptText(title);
@ -1510,9 +1512,9 @@ public class FormBuilder {
hBox.setSpacing(10);
ComboBox<T> comboBox1 = new JFXComboBox<>();
GUIUtil.initFilledStyle(comboBox1);
GUIUtil.applyFilledStyle(comboBox1);
ComboBox<R> comboBox2 = new JFXComboBox<>();
GUIUtil.initFilledStyle(comboBox2);
GUIUtil.applyFilledStyle(comboBox2);
hBox.getChildren().addAll(comboBox1, comboBox2);
final Tuple2<Label, VBox> topLabelWithVBox = addTopLabelWithVBox(gridPane, rowIndex, title, hBox, top);
@ -1540,7 +1542,7 @@ public class FormBuilder {
hBox.setSpacing(10);
JFXComboBox<T> comboBox = new JFXComboBox<>();
GUIUtil.initFilledStyle(comboBox);
GUIUtil.applyFilledStyle(comboBox);
comboBox.setPromptText(titleCombobox);
comboBox.setLabelFloat(true);
comboBox.getStyleClass().add("label-float");
@ -1586,7 +1588,7 @@ public class FormBuilder {
button.setDefaultButton(true);
ComboBox<T> comboBox = new JFXComboBox<>();
GUIUtil.initFilledStyle(comboBox);
GUIUtil.applyFilledStyle(comboBox);
hBox.getChildren().addAll(comboBox, button);
@ -1621,7 +1623,7 @@ public class FormBuilder {
hBox.setSpacing(10);
ComboBox<T> comboBox = new JFXComboBox<>();
GUIUtil.initFilledStyle(comboBox);
GUIUtil.applyFilledStyle(comboBox);
TextField textField = new TextField(textFieldText);
textField.setEditable(false);
textField.setMouseTransparent(true);

12
desktop/src/main/java/haveno/desktop/util/GUIUtil.java
View file

@ -1052,13 +1052,13 @@ public class GUIUtil {
gridPane.getColumnConstraints().addAll(columnConstraints1, columnConstraints2);
}
public static void initFilledStyle(TextField textField) {
public static void applyFilledStyle(TextField textField) {
textField.textProperty().addListener((observable, oldValue, newValue) -> {
setFilledStyle(textField);
updateFilledStyle(textField);
});
}
private static void setFilledStyle(TextField textField) {
private static void updateFilledStyle(TextField textField) {
if (textField.getText() != null && !textField.getText().isEmpty()) {
if (!textField.getStyleClass().contains("filled")) {
textField.getStyleClass().add("filled");
@ -1068,13 +1068,13 @@ public class GUIUtil {
}
}
public static void initFilledStyle(ComboBox<?> comboBox) {
public static void applyFilledStyle(ComboBox<?> comboBox) {
comboBox.valueProperty().addListener((observable, oldValue, newValue) -> {
setFilledStyle(comboBox);
updateFilledStyle(comboBox);
});
}
private static void setFilledStyle(ComboBox<?> comboBox) {
private static void updateFilledStyle(ComboBox<?> comboBox) {
if (comboBox.getValue() != null) {
if (!comboBox.getStyleClass().contains("filled")) {
comboBox.getStyleClass().add("filled");