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

Fix DatePicker auto-grow problem, remove unused code. #6602

Merged
merged 1 commit into from Mar 11, 2023
Merged

Fix DatePicker auto-grow problem, remove unused code. #6602

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
38 changes: 5 additions & 33 deletions desktop/src/main/java/bisq/desktop/util/FormBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
import javafx.scene.control.CheckBox;
import javafx.scene.control.ComboBox;
import javafx.scene.control.ContentDisplay;
import javafx.scene.control.Control;
import javafx.scene.control.DatePicker;
import javafx.scene.control.Label;
import javafx.scene.control.ListView;
Expand Down Expand Up @@ -681,43 +682,14 @@ public static Tuple2<Label, DatePicker> addTopLabelDatePicker(GridPane gridPane,
String title,
double top) {
DatePicker datePicker = new JFXDatePicker();
// fix display issue from github.com/bisq-network/bisq/issues/6216 and github.com/sshahine/JFoenix/issues/1245
datePicker.getEditor().setMinWidth(250);
datePicker.getEditor().setMaxWidth(Control.USE_PREF_SIZE);
datePicker.getEditor().setPrefWidth(Control.USE_PREF_SIZE);
Tuple2<Label, VBox> topLabelWithVBox = addTopLabelWithVBox(gridPane, rowIndex, columnIndex, title, datePicker, top);
return new Tuple2<>(topLabelWithVBox.first, datePicker);
}

///////////////////////////////////////////////////////////////////////////////////////////
// 2 DatePickers
///////////////////////////////////////////////////////////////////////////////////////////

public static Tuple2<DatePicker, DatePicker> add2TopLabelDatePicker(GridPane gridPane,
int rowIndex,
int columnIndex,
String title1,
String title2,
double top) {
DatePicker datePicker1 = new JFXDatePicker();
Tuple2<Label, VBox> topLabelWithVBox1 = getTopLabelWithVBox(title1, datePicker1);
VBox vBox1 = topLabelWithVBox1.second;

DatePicker datePicker2 = new JFXDatePicker();
Tuple2<Label, VBox> topLabelWithVBox2 = getTopLabelWithVBox(title2, datePicker2);
VBox vBox2 = topLabelWithVBox2.second;

Region spacer = new Region();
HBox.setHgrow(spacer, Priority.ALWAYS);

HBox hBox = new HBox();
hBox.setSpacing(10);
hBox.getChildren().addAll(spacer, vBox1, vBox2);

GridPane.setRowIndex(hBox, rowIndex);
GridPane.setColumnIndex(hBox, columnIndex);
GridPane.setMargin(hBox, new Insets(top, 0, 0, 0));
gridPane.getChildren().add(hBox);
return new Tuple2<>(datePicker1, datePicker2);
}


///////////////////////////////////////////////////////////////////////////////////////////
// Label + TxIdTextField
///////////////////////////////////////////////////////////////////////////////////////////
Expand Down