Merge branch 'develop' into feature/jack4all

Author: dromer

Libraries/pd-else

@@ -316,6 +316,13 @@ Canvas::Canvas(PluginEditor* parent, pd::Patch::Ptr p, Component* parentGraph)
     commandLocked.referTo(pd->commandLocked);
     commandLocked.addListener(this);
 
+    // pd->commandLocked doesn't get updated when a canvas isn't active
+    // So we set it to false here when a canvas is remade
+    // Otherwise the last canvas could have set it true, and it would still be
+    // in that state without command actually being locked
+    if (!isGraph)
+        commandLocked.setValue(false);
+    
     // init border for testing
     settingsChanged("border", SettingsFile::getInstance()->getPropertyAsValue("border"));
 
@@ -1320,7 +1327,9 @@ void Canvas::middleMouseChanged(bool isHeld)
 
 void Canvas::altKeyChanged(bool isHeld)
 {
-    SettingsFile::getInstance()->getValueTree().getChildWithName("Overlays").setProperty("alt_mode", isHeld, nullptr);
+    if(!isGraph) {
+        SettingsFile::getInstance()->getValueTree().getChildWithName("Overlays").setProperty("alt_mode", isHeld, nullptr);
+    }
 }
 
 void Canvas::mouseDown(MouseEvent const& e)

Resources/Fonts/IconFont.ttf

@@ -54,6 +54,7 @@ class DraggableNumber : public Label
         addListener(this);
         setFont(Fonts::getTabularNumbersFont().withHeight(14.0f));
         lookAndFeelChanged();
+        setInterceptsMouseClicks(true, true);
     }
 
     void colourChanged() override
@@ -104,10 +105,10 @@ class DraggableNumber : public Label
         onInteraction(false);
     }
 
-    void setEditableOnClick(bool editable)
+    void setEditableOnClick(bool editable, bool handleFocusLossManually = false)
     {
-        setEditable(editable, editable);
-        setInterceptsMouseClicks(true, true);
+        setEditable(editable, editable, handleFocusLossManually);
+        setWantsKeyboardFocus(true);
     }
 
     void setMaximum(double maximum)
@@ -589,14 +590,14 @@ class DraggableNumber : public Label
 
     void textEditorFocusLost (TextEditor& editor) override
     {
-        textEditorReturnKeyPressed(editor);
+        //hideEditor(false);
     }
 
     void textEditorReturnKeyPressed(TextEditor& editor) override
     {
         auto text = editor.getText();
         double newValue = parseExpression(text);
-        setValue(newValue);
+        setValue(newValue, dontSendNotification);
         onReturnKey(newValue);
     }
 };
@@ -610,7 +611,7 @@ struct DraggableListNumber : public DraggableNumber {
     explicit DraggableListNumber()
         : DraggableNumber(true)
     {
-        setEditableOnClick(true);
+        setEditableOnClick(true, true);
     }
 
     void mouseDown(MouseEvent const& e) override
@@ -693,7 +694,6 @@ struct DraggableListNumber : public DraggableNumber {
     void paint(Graphics& g) override
     {
         if (hoveredDecimal >= 0) {
-            // TODO: make this colour Id configurable?
             g.setColour(outlineColour.withAlpha(isMouseButtonDown() ? 0.5f : 0.3f));
             g.fillRoundedRectangle(hoveredDecimalPosition, 2.5f);
         }
@@ -724,7 +724,6 @@ struct DraggableListNumber : public DraggableNumber {
         }
 
         if (hoveredDecimal >= 0) {
-            // TODO: make this colour Id configurable
             auto const highlightColour = outlineColour.withAlpha(isMouseButtonDown() ? 0.5f : 0.3f);
             nvgFillColor(nvg, NVGComponent::convertColour(highlightColour));
             nvgFillRoundedRect(nvg, hoveredDecimalPosition.getX(), hoveredDecimalPosition.getY() - 1, hoveredDecimalPosition.getWidth(), hoveredDecimalPosition.getHeight(), 2.5f);
@@ -759,6 +758,12 @@ struct DraggableListNumber : public DraggableNumber {
             repaint();
         }
     }
+    
+    void textEditorReturnKeyPressed(TextEditor& editor) override
+    {
+        onReturnKey(0);
+        hideEditor(false);
+    }
 
     std::tuple<int, int, double> getListItemAtPosition(int x, Rectangle<float>* position = nullptr)
     {

Source/Canvas.cpp

@@ -322,22 +322,56 @@ class PropertiesPanel : public Component {
     struct FontComponent : public PropertiesPanelProperty {
         Value fontValue;
         StringArray options = Font::findAllTypefaceNames();
+        bool isFontMissing = false;
 
-        FontComponent(String const& propertyName, Value& value)
+        FontComponent(String const& propertyName, Value& value, File const& extraFontsDir = File())
             : PropertiesPanelProperty(propertyName)
         {
-            options.addIfNotAlreadyThere("Inter");
+            StringArray extraFontOptions;
+
+            if(extraFontsDir.isDirectory() && !extraFontsDir.isRoot()) {
+                auto patchFonts = Fonts::getFontsInFolder(extraFontsDir);
+                for (int n = 0; n < patchFonts.size(); n++) {
+                    extraFontOptions.addIfNotAlreadyThere(patchFonts[n].getFileNameWithoutExtension());
+                }
+            }
+#if JUCE_WINDOWS
+            extraFontOptions.addIfNotAlreadyThere("Inter Regular");
+#else
+            extraFontOptions.addIfNotAlreadyThere("Inter");
+#endif
+
+            auto offset = extraFontOptions.size();
+            extraFontOptions.addArray(options);
+
+            for (int n = 0; n < extraFontOptions.size(); n++) {
+                if (n == offset)
+                    comboBox.getRootMenu()->addSeparator();
+
+                comboBox.getRootMenu()->addCustomItem(n + 1, std::make_unique<FontEntry>(extraFontOptions[n]), nullptr, extraFontOptions[n]);
 
-            for (int n = 0; n < options.size(); n++) {
-                comboBox.getRootMenu()->addCustomItem(n + 1, std::make_unique<FontEntry>(options[n]), nullptr, options[n]);
             }
 
             comboBox.setText(value.toString());
             comboBox.getProperties().set("Style", "Inspector");
             fontValue.referTo(value);
 
-            comboBox.onChange = [this]() {
-                fontValue.setValue(options[comboBox.getSelectedItemIndex()]);
+            comboBox.onChange = [this, extraFontOptions, propertyName]() {
+                auto fontName = extraFontOptions[comboBox.getSelectedItemIndex()];
+
+                if (fontName.isEmpty()) {
+                    isFontMissing = true;
+                    fontName = fontValue.toString();
+                    PropertiesPanelProperty::setName(propertyName + " (missing)");
+                }
+                else {
+                    isFontMissing = false;
+                    PropertiesPanelProperty::setName(propertyName);
+                }
+
+                lookAndFeelChanged();
+                getParentComponent()->repaint();
+                fontValue.setValue(fontName);
             };
 
             setLookAndFeel(&LookAndFeel::getDefaultLookAndFeel());
@@ -354,12 +388,11 @@ class PropertiesPanel : public Component {
 
         void lookAndFeelChanged() override
         {
-            comboBox.setColour(ComboBox::textColourId, findColour(PlugDataColour::panelTextColourId));
+            comboBox.setColour(ComboBox::textColourId, isFontMissing ? Colours::red : findColour(PlugDataColour::panelTextColourId));
         }
 
         void setFont(String const& fontName)
         {
-            fontValue.setValue(fontValue);
             comboBox.setText(fontName);
         }