diff options
Diffstat (limited to 'src/de/fhswf/in/inf/upnfx/view')
| -rw-r--r-- | src/de/fhswf/in/inf/upnfx/view/MainViewController.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/de/fhswf/in/inf/upnfx/view/MainViewController.java b/src/de/fhswf/in/inf/upnfx/view/MainViewController.java index 6a9a115..1ee9173 100644 --- a/src/de/fhswf/in/inf/upnfx/view/MainViewController.java +++ b/src/de/fhswf/in/inf/upnfx/view/MainViewController.java @@ -80,7 +80,7 @@ public class MainViewController private ObservableDoubleStack upnStack = upnClass.getStack(); private StringProperty newNumber = new SimpleStringProperty(""); - + private static Map<String, Operator> operators = new HashMap<>(); static @@ -103,7 +103,7 @@ public class MainViewController { txtField.textProperty().addListener(e -> { btnComma.setDisable(!newNumber.isEmpty().get() && newNumber.get().contains(".")); - btnZero.setDisable(!newNumber.isEmpty().get() && !newNumber.get().contains(".") && newNumber.get().contains("0")); + btnZero.setDisable(!newNumber.isEmpty().get() && !newNumber.get().contains(".") && newNumber.get().startsWith("0")); }); newNumber.addListener(e -> { @@ -114,7 +114,7 @@ public class MainViewController if(!newNumber.isEmpty().get()) { txtField.setText(newNumber.get()); - + btnPlus.setDisable(upnStack.size() < 1); btnMinus.setDisable(upnStack.size() < 1); btnMul.setDisable(upnStack.size() < 1); @@ -231,7 +231,14 @@ public class MainViewController private void handleNumber(String number) { - newNumber.set(newNumber.concat(number).get()); + if(newNumber.get().equals("0") && !number.equals(".")) + { + newNumber.set(number); + } + else + { + newNumber.set(newNumber.concat(number).get()); + } } @FXML |