boldsuck/haveno
1
0
Fork 0
mirror of https://github.com/boldsuck/haveno.git synced 2024-12-22 20:19:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Replace JFXDatePicker with DatePicker (#750)

Browse source
This commit is contained in:
preland 2024-01-15 08:54:22 -06:00 committed by GitHub
parent 022028bb41
commit 1a981f28df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -34,4 +34,5 @@ deploy
/monitor/monitor-tor/* /monitor/monitor-tor/*
.java-version .java-version
.localnet .localnet
.vscode .vscode
.vim/*

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

@ -18,7 +18,7 @@
package haveno.desktop.util; package haveno.desktop.util;
import com.jfoenix.controls.JFXComboBox; import com.jfoenix.controls.JFXComboBox;
import com.jfoenix.controls.JFXDatePicker; //import com.jfoenix.controls.JFXDatePicker;
import com.jfoenix.controls.JFXTextArea; import com.jfoenix.controls.JFXTextArea;
import com.jfoenix.controls.JFXToggleButton; import com.jfoenix.controls.JFXToggleButton;
import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeDude;
@ -669,7 +669,13 @@ public class FormBuilder {
int columnIndex, int columnIndex,
String title, String title,
double top) { double top) {
DatePicker datePicker = new JFXDatePicker(); //DatePicker datePicker = new JFXDatePicker();
//
//Temporary solution to fix issue 527; a more
//permanant solution would require this issue to be solved:
//(https://github.com/sshahine/JFoenix/issues/1245)
DatePicker datePicker = new DatePicker();
Tuple2<Label, VBox> topLabelWithVBox = addTopLabelWithVBox(gridPane, rowIndex, columnIndex, title, datePicker, top); Tuple2<Label, VBox> topLabelWithVBox = addTopLabelWithVBox(gridPane, rowIndex, columnIndex, title, datePicker, top);
return new Tuple2<>(topLabelWithVBox.first, datePicker); return new Tuple2<>(topLabelWithVBox.first, datePicker);
} }
@ -684,11 +690,14 @@ public class FormBuilder {
String title1, String title1,
String title2, String title2,
double top) { double top) {
DatePicker datePicker1 = new JFXDatePicker();
//DatePicker datePicker1 = new JFXDatePicker();
DatePicker datePicker1 = new DatePicker();
Tuple2<Label, VBox> topLabelWithVBox1 = getTopLabelWithVBox(title1, datePicker1); Tuple2<Label, VBox> topLabelWithVBox1 = getTopLabelWithVBox(title1, datePicker1);
VBox vBox1 = topLabelWithVBox1.second; VBox vBox1 = topLabelWithVBox1.second;
DatePicker datePicker2 = new JFXDatePicker(); //DatePicker datePicker2 = new JFXDatePicker();
DatePicker datePicker2 = new DatePicker();
Tuple2<Label, VBox> topLabelWithVBox2 = getTopLabelWithVBox(title2, datePicker2); Tuple2<Label, VBox> topLabelWithVBox2 = getTopLabelWithVBox(title2, datePicker2);
VBox vBox2 = topLabelWithVBox2.second; VBox vBox2 = topLabelWithVBox2.second;