Make nbx/floatbox return key behaviour like Pd

plugdata-team · Nov 28, 2024 · b3a8f33 · b3a8f33
1 parent 3a9dec4
commit b3a8f33
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/Source/Components/DraggableNumber.h b/Source/Components/DraggableNumber.h
@@ -41,6 +41,7 @@ class DraggableNumber : public Label
 
 public:
     std::function<void(double)> onValueChange = [](double) { };
+    std::function<void(double)> onReturnKey = [](double) { };
     std::function<void()> dragStart = []() { };
     std::function<void()> dragEnd = []() { };
 
@@ -587,7 +588,7 @@ class DraggableNumber : public Label
 
         return 0.0f;
     }
-        
+
     void textEditorFocusLost (TextEditor& editor) override
     {
         textEditorReturnKeyPressed(editor);
@@ -598,6 +599,7 @@ class DraggableNumber : public Label
         auto text = editor.getText();
         double newValue = parseExpression(text);
         setValue(newValue);
+        onReturnKey(newValue);
     }
 };
 

diff --git a/Source/Objects/FloatAtomObject.h b/Source/Objects/FloatAtomObject.h
@@ -63,6 +63,11 @@ class FloatAtomObject final : public ObjectBase {
                 object->updateBounds();
             }
         };
+
+        input.onReturnKey = [this](double newValue)
+        {
+            sendFloatValue(newValue);
+        };
 
         input.dragEnd = [this]() {
             stopEdition();
@@ -112,7 +117,6 @@ class FloatAtomObject final : public ObjectBase {
         if (key.getKeyCode() == KeyPress::returnKey) {
             auto inputValue = input.getText().getFloatValue();
             sendFloatValue(inputValue);
-            cnv->grabKeyboardFocus();
             return true;
         }
 

diff --git a/Source/Objects/NumberObject.h b/Source/Objects/NumberObject.h
@@ -52,7 +52,7 @@ class NumberObject final : public ObjectBase {
             editor->setColour(TextEditor::focusedOutlineColourId, Colours::transparentBlack);
             editor->setBorder({ 0, 8, 4, 1 });
         };
-
+        
         input.onInteraction = [this](bool isFocused) {
             if (isFocused)
                 input.setColour(Label::textColourId, convertColour(backgroundCol).contrasting());
@@ -77,6 +77,11 @@ class NumberObject final : public ObjectBase {
         input.onValueChange = [this](float newValue) {
             sendFloatValue(newValue);
         };
+
+        input.onReturnKey = [this](double newValue)
+        {
+            sendFloatValue(newValue);
+        };
 
         input.dragEnd = [this]() {
             stopEdition();
@@ -206,7 +211,6 @@ class NumberObject final : public ObjectBase {
             auto inputValue = input.getText().getFloatValue();
             preFocusValue = value;
             sendFloatValue(inputValue);
-            cnv->grabKeyboardFocus();
             return true;
         }