Fix number box expression parsing

Author: timothyschoen

Source/Components/DraggableNumber.h

@@ -82,27 +82,11 @@ class DraggableNumber : public Label
     void editorHidden(Label*, TextEditor& editor) override
     {
         auto text = editor.getText();
-        double newValue;
-        if(!text.containsOnly("0123456789."))
-        {
-            String parseError;
-            try {
-                newValue = Expression(text, parseError).evaluate();
-            } catch (...) {
-                newValue = 0.0f;
-            }
-            
-            if(!parseError.isEmpty())
-            {
-                newValue = 0.0f;
-            }
-        }
-        else {
-            newValue = text.getDoubleValue();
-        }
+        double newValue = parseExpression(text);
 
         onInteraction(hasKeyboardFocus(false));
         setValue(newValue, dontSendNotification);
+        editor.setText(getText(), dontSendNotification);
         decimalDrag = 0;
         dragEnd();
     }
@@ -554,6 +538,41 @@ class DraggableNumber : public Label
 
         return text;
     }
+        
+    double parseExpression(String const& expression)
+    {
+        if(expression.containsOnly("0123456789."))
+        {
+            return expression.getDoubleValue();
+        }
+        else {
+            String parseError;
+            try {
+                return Expression(expression, parseError).evaluate();
+            } catch (...) {
+                return 0.0f;
+            }
+            
+            if(!parseError.isEmpty())
+            {
+                return 0.0f;
+            }
+        }
+        
+        return 0.0f;
+    }
+        
+    void textEditorFocusLost (TextEditor& editor) override
+    {
+        textEditorReturnKeyPressed(editor);
+    }
+    
+    void textEditorReturnKeyPressed(TextEditor& editor) override
+    {
+        auto text = editor.getText();
+        double newValue = parseExpression(text);
+        setValue(newValue);
+    }
 };
 
 struct DraggableListNumber : public DraggableNumber {