Improve text/number editor: fix interactionFn, fix int showing decimals, clean up number range

Author: timothyschoen

Source/Canvas.cpp

@@ -796,8 +796,12 @@ void Canvas::performRender(NVGcontext* nvg, Rectangle<int> invalidRegion)
     if (canvasSearchHighlight)
         canvasSearchHighlight->render(nvg);
 
-    if (dimensionsAreBeingEdited)
+    if (dimensionsAreBeingEdited) {
+        bool borderWasShown = showBorder;
+        showBorder = true;
         drawBorder(false, true);
+        showBorder = borderWasShown;
+    }
 
     if (objectsDistributeResizer)
         objectsDistributeResizer->render(nvg);
@@ -2788,8 +2792,8 @@ void Canvas::receiveMessage(t_symbol* symbol, SmallArray<pd::Atom> const& atoms)
         if (atoms.size() >= 4) {
             auto const width = atoms[2].getFloat() - atoms[0].getFloat();
             auto const height = atoms[3].getFloat() - atoms[1].getFloat();
-            setValueExcludingListener(patchWidth, width, this);
-            setValueExcludingListener(patchHeight, height, this);
+            setValueExcludingListener(patchWidth, static_cast<int>(width), this);
+            setValueExcludingListener(patchHeight, static_cast<int>(height), this);
             repaint();
         }
 

Source/Components/DraggableNumber.cpp

@@ -644,7 +644,7 @@ void DraggableNumber::mouseUp(MouseEvent const& e)
     if (editor)
         return;
 
-    onInteraction(hasKeyboardFocus(false));
+    onInteraction(false);
 
     repaint();
 

Source/Components/PropertiesPanel.h

@@ -312,15 +312,17 @@ class PropertiesPanel : public Component {
         Value property;
         String allowedCharacters = "";
         double min, max;
+        bool limit;
 
     public:
         std::unique_ptr<Component> label;
 
-        EditableComponent(String const& propertyName, Value const& value, double minimum = 0.0, double maximum = 0.0, std::function<void(bool)> onInteractionFn = nullptr)
+            EditableComponent(String const& propertyName, Value const& value, bool clip = false, double minimum = 0.0, double maximum = 1<<30, std::function<void(bool)> onInteractionFn = nullptr)
             : PropertiesPanelProperty(propertyName)
             , property(value)
             , min(minimum)
             , max(maximum)
+            , limit(clip)
         {
             if constexpr (std::is_arithmetic_v<T>) {
                 auto* draggableNumber = new DraggableNumber(std::is_integral_v<T>);
@@ -331,29 +333,30 @@ class PropertiesPanel : public Component {
                 draggableNumber->setFont(draggableNumber->getFont().withHeight(14.5f));
                 draggableNumber->setEditableOnClick(true);
 
-                if (minimum != 0.0f)
+                if(clip)
+                {
                     draggableNumber->setMinimum(minimum);
-                if (maximum != 0.0f)
                     draggableNumber->setMaximum(maximum);
+                }
 
                 if (onInteractionFn)
                     draggableNumber->onInteraction = onInteractionFn;
-
+                
                 draggableNumber->setPrecision(3);
 
                 draggableNumber->onValueChange = [this](double const newValue) {
-                    if (min != 0.0f || max != 0.0f) {
-                        property = std::clamp(newValue, min, max);
+                    if (limit) {
+                        property = std::clamp<T>(newValue, min, max);
                     } else {
-                        property = newValue;
+                        property = static_cast<T>(newValue);
                     }
                 };
 
                 draggableNumber->onReturnKey = [this](double const newValue) {
-                    if (min != 0.0f || max != 0.0f) {
-                        property = std::clamp(newValue, min, max);
+                    if (limit) {
+                        property = std::clamp<T>(newValue, min, max);
                     } else {
-                        property = newValue;
+                        property = static_cast<T>(newValue);
                     }
                 };
 
@@ -382,7 +385,7 @@ class PropertiesPanel : public Component {
 
                 labelComp->onEditorHide = [this] {
                     // synchronise the value to the canvas when updated
-                    if (PluginEditor* pluginEditor = findParentComponentOfClass<PluginEditor>()) {
+                    if (auto* pluginEditor = findParentComponentOfClass<PluginEditor>()) {
                         if (auto const cnv = pluginEditor->getCurrentCanvas())
                             cnv->synchronise();
                     }
@@ -398,8 +401,8 @@ class PropertiesPanel : public Component {
         {
             if constexpr (std::is_arithmetic_v<T>) {
                 auto const draggableNumber = reinterpret_cast<DraggableNumber*>(label.get());
-                auto const value = getValue<double>(v);
-                if (value != draggableNumber->getValue()) {
+                auto const value = getValue<T>(v);
+                if (value != static_cast<T>(draggableNumber->getValue())) {
                     draggableNumber->setValue(value, dontSendNotification);
                 }
             }
@@ -415,22 +418,6 @@ class PropertiesPanel : public Component {
             allowedCharacters = newAllowedCharacters;
         }
 
-        void setRangeMin(float const minimum)
-        {
-            min = minimum;
-            if constexpr (std::is_arithmetic_v<T>) {
-                dynamic_cast<DraggableNumber*>(label.get())->setMinimum(minimum);
-            }
-        }
-
-        void setRangeMax(float const maximum)
-        {
-            max = maximum;
-            if constexpr (std::is_arithmetic_v<T>) {
-                dynamic_cast<DraggableNumber*>(label.get())->setMaximum(maximum);
-            }
-        }
-
         void resized() override
         {
             label->setBounds(getLocalBounds().removeFromRight(getWidth() / (2 - hideLabel)));

Source/Dialogs/AdvancedSettingsPanel.h

@@ -67,7 +67,7 @@ class AdvancedSettingsPanel final : public SettingsDialogPanel
         otherProperties.add(new PropertiesPanel::BoolComponent("Enable auto patching", autoPatchingValue, { "No", "Yes" }));
 
         autosaveInterval.referTo(settingsFile->getPropertyAsValue("autosave_interval"));
-        autosaveProperties.add(new PropertiesPanel::EditableComponent<int>("Auto-save interval (minutes)", autosaveInterval, 1, 60));
+        autosaveProperties.add(new PropertiesPanel::EditableComponent<int>("Auto-save interval (minutes)", autosaveInterval, true, 1, 60));
 
         autosaveEnabled.referTo(settingsFile->getPropertyAsValue("autosave_enabled"));
         autosaveProperties.add(new PropertiesPanel::BoolComponent("Enable autosave", autosaveEnabled, { "No", "Yes" }));
@@ -128,7 +128,7 @@ class AdvancedSettingsPanel final : public SettingsDialogPanel
 
         defaultZoom = settingsFile->getProperty<float>("default_zoom");
         defaultZoom.addListener(this);
-        interfaceProperties.add(new PropertiesPanel::EditableComponent<float>("Default zoom %", defaultZoom));
+        interfaceProperties.add(new PropertiesPanel::EditableComponent<float>("Default zoom %", defaultZoom, true, 25, 300));
 
         centreResized = settingsFile->getPropertyAsValue("centre_resized_canvas");
         centreResized.addListener(this);

Source/Dialogs/AudioSettingsPanel.h

@@ -493,15 +493,12 @@ class DAWAudioSettingsPanel final : public SettingsDialogPanel
 
         latencyValue = processor->getLatencySamples() - pd::Instance::getBlockSize();
 
-        latencyNumberBox = new PropertiesPanel::EditableComponent<int>("Latency (samples)", latencyValue);
+        latencyNumberBox = new PropertiesPanel::EditableComponent<int>("Latency (samples)", latencyValue, true, 0, 1<<30);
         tailLengthNumberBox = new PropertiesPanel::EditableComponent<float>("Tail length (seconds)", tailLengthValue);
 
         dawSettingsPanel.addSection("Audio", { latencyNumberBox, tailLengthNumberBox });
 
         addAndMakeVisible(dawSettingsPanel);
-
-        latencyNumberBox->setRangeMin(0);
-        latencyNumberBox->setRangeMax(1 << 30);
     }
 
     PropertiesPanel* getPropertiesPanel() override

Source/Heavy/DaisyExporter.h

@@ -35,9 +35,7 @@ class DaisyExporter final : public ExporterBase {
         usbMidiProperty = new PropertiesPanel::BoolComponent("USB MIDI", usbMidiValue, { "No", "Yes" });
         properties.add(usbMidiProperty);
         properties.add(new PropertiesPanel::BoolComponent("Debug printing", debugPrintValue, { "No", "Yes" }));
-        auto const blocksizeProperty = new PropertiesPanel::EditableComponent<int>("Blocksize", blocksizeValue);
-        blocksizeProperty->setRangeMin(1);
-        blocksizeProperty->setRangeMax(256);
+        auto const blocksizeProperty = new PropertiesPanel::EditableComponent<int>("Blocksize", blocksizeValue, true, 1, 256);
         blocksizeProperty->editableOnClick(false);
         properties.add(blocksizeProperty);
         properties.add(new PropertiesPanel::ComboComponent("Samplerate", samplerateValue, { "8000", "16000", "32000", "48000", "96000" }));

Source/Objects/ArrayObject.h

@@ -887,12 +887,9 @@ class ArrayListView final : public PropertiesPanel
             for (int i = 0; i < numProperties; i++) {
                 auto& value = *arrayValues.add(new Value(vec[i].w_float));
                 value.addListener(this);
-                auto* property = new EditableComponent<float>(String(i), value);
+                auto* property = new EditableComponent<float>(String(i), value, true, ptr->x_glist->gl_y2, ptr->x_glist->gl_y1);
                 auto* label = dynamic_cast<DraggableNumber*>(property->label.get());
 
-                property->setRangeMin(ptr->x_glist->gl_y2);
-                property->setRangeMax(ptr->x_glist->gl_y1);
-
                 // Only send this after drag end so it doesn't interrupt the drag action
                 label->dragEnd = [this] {
                     if (auto p = array.get<t_fake_garray>()) {

Source/Sidebar/Inspector.h

@@ -123,20 +123,10 @@ class Inspector final : public Component {
         case tString:
             return new PropertiesPanel::EditableComponent<String>(name, *value);
         case tFloat: {
-            auto* c = new PropertiesPanel::EditableComponent<float>(name, *value);
-            if(clip) {
-                c->setRangeMin(min);
-                c->setRangeMax(max);
-            }
-            return c;
+            return new PropertiesPanel::EditableComponent<float>(name, *value, clip, min, max);
         }
         case tInt: {
-            auto* c = new PropertiesPanel::EditableComponent<int>(name, *value);
-            if(clip) {
-                c->setRangeMin(min);
-                c->setRangeMax(max);
-            }
-            return c;
+            return new PropertiesPanel::EditableComponent<int>(name, *value, clip, min, max, onInteractionFn);
         }
         case tColour:
             return new PropertiesPanel::InspectorColourComponent(name, *value);