Fix libraries and paths not updating, add toggle to enable Gem

Author: timothyschoen

Source/Dialogs/PathsSettingsPanel.h

@@ -273,7 +273,8 @@ class SearchPathPanel final : public Component
         paths.clear();
 
         for (auto& child : SettingsFile::getInstance()->getProperty<VarArray>("paths")) {
-            paths.add(child);
+            auto path = child.toString();
+            if(path.isNotEmpty()) paths.add(path);
         }
 
         listBox.updateContent();
@@ -508,7 +509,6 @@ class LibraryLoadPanel final : public Component
         auto [x, newWidth] = getContentXAndWidth();
 
         if (rowIsSelected) {
-
             bool const roundTop = rowNumber == 0;
             Path p;
             p.addRoundedRectangle(x, 0.0f, newWidth, height, Corners::largeCornerRadius, Corners::largeCornerRadius, roundTop, roundTop, false, false);
@@ -574,7 +574,8 @@ class LibraryLoadPanel final : public Component
         librariesToLoad.clear();
 
         for (auto& child : SettingsFile::getInstance()->getProperty<VarArray>("libraries")) {
-            librariesToLoad.addIfNotAlreadyThere(child.toString());
+            auto library = child.toString();
+            if(library.isNotEmpty()) librariesToLoad.add(library);
         }
 
         listBox.updateContent();
@@ -681,20 +682,47 @@ class LibraryLoadPanel final : public Component
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(LibraryLoadPanel)
 };
 
+class EnableGemToggle : public PropertiesPanel::BoolComponent
+{
+public:
+    EnableGemToggle() : PropertiesPanel::BoolComponent("Enable GEM", Value(), {"No", "Yes"})
+    {
+        toggleStateValue.referTo(SettingsFile::getInstance()->getPropertyAsValue("enable_gem"));
+    }
+
+private:
+    void paint(Graphics& g) override
+    {
+        auto b = getLocalBounds().reduced(2);
+        StackShadow::drawShadowForRect(g, b.reduced(3), 8, Corners::largeCornerRadius, 0.4f);
+
+        g.setColour(PlugDataColours::panelForegroundColour);
+        g.fillRoundedRectangle(b.toFloat(), Corners::largeCornerRadius);
+
+        g.setColour(PlugDataColours::toolbarOutlineColour);
+        g.drawRoundedRectangle(b.toFloat(), Corners::largeCornerRadius, 1.0f);
+
+        PropertiesPanel::BoolComponent::paint(g);
+    }
+};
+
 class PathsSettingsPanel final : public SettingsDialogPanel
     , public ComponentListener {
 public:
     PathsSettingsPanel()
     {
         container.addAndMakeVisible(searchPathsPanel);
         container.addAndMakeVisible(libraryLoadPanel);
+        container.addAndMakeVisible(enableGemToggle);
 
         searchPathsPanel.onChange = [this] {
             updateBounds();
+            SettingsFile::getInstance()->triggerSettingsChange("paths");
         };
 
         libraryLoadPanel.onChange = [this] {
             updateBounds();
+            SettingsFile::getInstance()->triggerSettingsChange("libraries");
         };
 
         container.setVisible(true);
@@ -709,7 +737,8 @@ class PathsSettingsPanel final : public SettingsDialogPanel
 private:
     void updateBounds()
     {
-        searchPathsPanel.setSize(getWidth(), 96.0f + (searchPathsPanel.getNumRows() + 1) * 32.0f);
+        enableGemToggle.setBounds(getLocalBounds().withTrimmedTop(4).removeFromTop(50).reduced(40, 8));
+        searchPathsPanel.setBounds(0, 46, getWidth(), 96.0f + (searchPathsPanel.getNumRows() + 1) * 32.0f);
         libraryLoadPanel.setBounds(libraryLoadPanel.getX(), searchPathsPanel.getBottom() + 4.0f, getWidth(), 52.0f + (libraryLoadPanel.getNumRows() + 1) * 32.0f);
 
         container.setBounds(getLocalBounds().getUnion(searchPathsPanel.getBounds()).getUnion(libraryLoadPanel.getBounds()));
@@ -721,6 +750,7 @@ class PathsSettingsPanel final : public SettingsDialogPanel
         updateBounds();
     }
 
+    EnableGemToggle enableGemToggle;
     SearchPathPanel searchPathsPanel;
     LibraryLoadPanel libraryLoadPanel;
 

Source/Pd/Library.h

@@ -94,7 +94,6 @@ class Library final : public FileSystemWatcher::Listener
         ProjectInfo::appDataDir.getChildFile("Abstractions"),
         ProjectInfo::appDataDir.getChildFile("Externals"),
         ProjectInfo::appDataDir.getChildFile("Extra").getChildFile("else"),
-        ProjectInfo::appDataDir.getChildFile("Extra").getChildFile("Gem"),
         ProjectInfo::appDataDir.getChildFile("Extra") };
 
     static inline StringArray objectOrigins = { "vanilla", "ELSE", "cyclone", "Gem", "heavylib", "pdlua", "MERDA" };

Source/PluginProcessor.cpp

@@ -549,7 +549,6 @@ void PluginProcessor::updateSearchPaths()
 
     // Load startup libraries that the user defined in settings
     for (auto library : librariesTree) {
-
         auto const libName = library.toString();
         // Load the library: this must be done after updating paths
         // If the library is already loaded, it will return true
@@ -559,6 +558,11 @@ void PluginProcessor::updateSearchPaths()
         }
     }
 
+    if(SettingsFile::getInstance()->getProperty<bool>("enable_gem")) {
+        libpd_add_to_search_path(ProjectInfo::appDataDir.getChildFile("Abstractions").getChildFile("Gem").getFullPathName().toRawUTF8());
+        loadLibrary("Gem");
+    }
+
     unlockAudioThread();
 }
 
@@ -776,6 +780,13 @@ bool PluginProcessor::isBusesLayoutSupported(BusesLayout const& layouts) const
     return ninch <= 32 && noutch <= 32;
 }
 
+void PluginProcessor::settingsChanged(String const& name, var const& value)
+{
+    if(name == "paths" || name == "libraries" || name == "enable_gem") {
+        updateSearchPaths();
+    }
+}
+
 void PluginProcessor::settingsFileReloaded()
 {
     auto const newTheme = settingsFile->getProperty<String>("theme");

Source/PluginProcessor.h

@@ -127,6 +127,7 @@ class PluginProcessor final : public AudioProcessor
         return nbus > 0;
     }
 
+    void settingsChanged(String const& name, var const& value) override;
     void settingsFileReloaded() override;
 
     static bool initialiseFilesystem();

Source/Utility/SettingsFile.h

@@ -164,6 +164,7 @@ class SettingsFile final
         { "hvcc_mode", var(false) },
         { "heavy_state", var(new DynamicObject()) },
         { "touch_mode", var(false) },
+        { "enable_gem", var(false) },
         { "keymap", var("") },
         { "last_welcome_panel", var(0) },
         { "active_themes", var(Array<var> { "light", "dark" }) },