Skip to content
Snippets Groups Projects
Commit 4ea47ea4 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

Fixed #206 - search --> rangeslider --> textfields on change not only on enter

parent 65a1bbfb
No related branches found
No related tags found
1 merge request!213merge v1_6_0 into master
...@@ -127,7 +127,6 @@ public class SearchController extends BaseController implements Styleable ...@@ -127,7 +127,6 @@ public class SearchController extends BaseController implements Styleable
hboxSearchByAmount.setDisable(true); hboxSearchByAmount.setDisable(true);
int maximum; int maximum;
try try
{ {
...@@ -160,12 +159,7 @@ public class SearchController extends BaseController implements Styleable ...@@ -160,12 +159,7 @@ public class SearchController extends BaseController implements Styleable
HBox.setHgrow(rangeSlider, Priority.ALWAYS); HBox.setHgrow(rangeSlider, Priority.ALWAYS);
textFieldAmountMin.setTextFormatter(new TextFormatter<>(c -> { textFieldAmountMin.setTextFormatter(new TextFormatter<>(c -> {
if(c.getControlNewText().isEmpty()) if(c.getControlNewText().isEmpty() || c.getControlNewText().matches("[0-9]*"))
{
return c;
}
if(c.getControlNewText().matches("[0-9]*"))
{ {
return c; return c;
} }
...@@ -176,12 +170,7 @@ public class SearchController extends BaseController implements Styleable ...@@ -176,12 +170,7 @@ public class SearchController extends BaseController implements Styleable
})); }));
textFieldAmountMax.setTextFormatter(new TextFormatter<>(c -> { textFieldAmountMax.setTextFormatter(new TextFormatter<>(c -> {
if(c.getControlNewText().isEmpty()) if(c.getControlNewText().isEmpty() || c.getControlNewText().matches("[0-9]*"))
{
return c;
}
if(c.getControlNewText().matches("[0-9]*"))
{ {
return c; return c;
} }
...@@ -191,26 +180,12 @@ public class SearchController extends BaseController implements Styleable ...@@ -191,26 +180,12 @@ public class SearchController extends BaseController implements Styleable
} }
})); }));
textFieldAmountMin.setOnKeyReleased((event)->{ textFieldAmountMin.textProperty().addListener((a, b, c)->{
if(event.getCode() == KeyCode.ENTER) setRangeSliderAmountMin();
{
String text = textFieldAmountMin.getText();
if(text != null && !text.equals(""))
{
rangeSlider.setLowValue(Integer.parseInt(text));
}
}
}); });
textFieldAmountMax.setOnKeyReleased((event)->{ textFieldAmountMax.textProperty().addListener((a, b, c)->{
if(event.getCode() == KeyCode.ENTER) setRangeSliderAmountMax();
{
String text = textFieldAmountMax.getText();
if(text != null && !text.equals(""))
{
rangeSlider.setHighValue(Integer.parseInt(text));
}
}
}); });
textFieldAmountMin.setText("0"); textFieldAmountMin.setText("0");
...@@ -233,6 +208,24 @@ public class SearchController extends BaseController implements Styleable ...@@ -233,6 +208,24 @@ public class SearchController extends BaseController implements Styleable
applyStyle(); applyStyle();
} }
private void setRangeSliderAmountMin()
{
String text = textFieldAmountMin.getText();
if(text != null && !text.equals(""))
{
rangeSlider.setLowValue(Integer.parseInt(text));
}
}
private void setRangeSliderAmountMax()
{
String text = textFieldAmountMax.getText();
if(text != null && !text.equals(""))
{
rangeSlider.setHighValue(Integer.parseInt(text));
}
}
private int getMaxAmountFromServer() throws Exception private int getMaxAmountFromServer() throws Exception
{ {
ServerConnection connection = new ServerConnection(controller.getSettings()); ServerConnection connection = new ServerConnection(controller.getSettings());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment