Merge branch 'develop' into feature/heavy-dpf-nanovg-gui

Author: dromer

Source/Dialogs/Dialogs.cpp

@@ -90,12 +90,12 @@ bool Dialog::wantsRoundedCorners() const
     return true;
 }
 
-Component* Dialogs::showTextEditorDialog(String const& text, String filename, std::function<void(String, bool)> closeCallback, std::function<void(String)> saveCallback, float const desktopScale, bool const enableSyntaxHighlighting)
+Component* Dialogs::showTextEditorDialog(String const& text, String filename, std::function<void(String, bool)> closeCallback, std::function<void(String)> saveCallback, float const desktopScale, bool const enableSyntaxHighlighting, File const& associatedFile)
 {
 #if ENABLE_TESTING
     return nullptr;
 #endif
-    auto* editor = new TextEditorDialog(std::move(filename), enableSyntaxHighlighting, std::move(closeCallback), std::move(saveCallback), desktopScale);
+    auto* editor = new TextEditorDialog(std::move(filename), enableSyntaxHighlighting, std::move(closeCallback), std::move(saveCallback), desktopScale, associatedFile);
     editor->editor.setText(text);
     return editor;
 }

Source/Dialogs/Dialogs.h

@@ -172,7 +172,7 @@ class Dialog final : public Component {
 };
 
 struct Dialogs {
-    static Component* showTextEditorDialog(String const& text, String filename, std::function<void(String, bool)> closeCallback, std::function<void(String)> saveCallback, float desktopScale = 1.0f, bool enableSyntaxHighlighting = false);
+    static Component* showTextEditorDialog(String const& text, String filename, std::function<void(String, bool)> closeCallback, std::function<void(String)> saveCallback, float desktopScale = 1.0f, bool enableSyntaxHighlighting = false, File const& associatedFile = File());
     static void appendTextToTextEditorDialog(Component* dialog, String const& text);
     static void clearTextEditorDialog(Component* dialog);
 

Source/Dialogs/TextEditorDialog.h

@@ -2975,6 +2975,7 @@ struct TextEditorDialog final : public Component
     MainToolbarButton undoButton = MainToolbarButton(Icons::Undo);
     MainToolbarButton redoButton = MainToolbarButton(Icons::Redo);
     MainToolbarButton searchButton = MainToolbarButton(Icons::Search);
+    MainToolbarButton openExternallyButton = MainToolbarButton(Icons::OpenLink);
 
     SmallIconButton zoomComboButton;
     SearchEditor searchInput;
@@ -2984,13 +2985,15 @@ struct TextEditorDialog final : public Component
 
     String title;
     int margin;
+    File associatedFile;
 
-    explicit TextEditorDialog(String name, bool const enableSyntaxHighlighting, std::function<void(String, bool)> const& closeCallback, std::function<void(String)> const& saveCallback, float const scale)
+    explicit TextEditorDialog(String name, bool const enableSyntaxHighlighting, std::function<void(String, bool)> const& closeCallback, std::function<void(String)> const& saveCallback, float const scale, File fileToOpen = File())
         : resizer(this, &constrainer)
         , onClose(closeCallback)
         , onSave(saveCallback)
         , title(std::move(name))
         , margin(ProjectInfo::canUseSemiTransparentWindows() ? 15 : 0)
+        , associatedFile(std::move(fileToOpen))
         , desktopScale(scale)
     {
         closeButton.reset(LookAndFeel::getDefaultLookAndFeel().createDocumentWindowButton(-1));
@@ -3011,15 +3014,20 @@ struct TextEditorDialog final : public Component
         addToDesktop(0);
         setVisible(true);
 
-        // Position in centre of screen
-        setBounds((Desktop::getInstance().getDisplays().getPrimaryDisplay()->userBounds / desktopScale).withSizeKeepingCentre(700, 500).getSmallestIntegerContainer());
-
         addAndMakeVisible(saveButton);
         addAndMakeVisible(undoButton);
         addAndMakeVisible(redoButton);
         addAndMakeVisible(searchButton);
         addAndMakeVisible(zoomComboButton);
 
+        // Only text that is backed by a file on disk can be opened in an external editor
+        addChildComponent(openExternallyButton);
+        openExternallyButton.setVisible(associatedFile.existsAsFile());
+        openExternallyButton.setTooltip("Open in default text editor");
+
+        // Position in centre of screen
+        setBounds((Desktop::getInstance().getDisplays().getPrimaryDisplay()->userBounds / desktopScale).withSizeKeepingCentre(700, 500).getSmallestIntegerContainer());
+
         zoomComboButton.setButtonText(Icons::ThinDown);
 
         zoomComboButton.onClick = [this] {
@@ -3056,6 +3064,15 @@ struct TextEditorDialog final : public Component
             editor.setUnchanged();
         };
 
+        openExternallyButton.onClick = [this] {
+            // Make sure the external editor sees the text as it currently is in this dialog
+            if (editor.hasChanged()) {
+                onSave(editor.getText());
+                editor.setUnchanged();
+            }
+            associatedFile.startAsProcess();
+        };
+
         searchButton.onClick = [this] {
             searchInput.setVisible(searchButton.getToggleState());
             editor.setSearchText("");
@@ -3117,20 +3134,19 @@ struct TextEditorDialog final : public Component
         auto const closeButtonBounds = toolbarBounds.removeFromRight(30).reduced(0, 5).translated(-5, 1);
         closeButton->setBounds(closeButtonBounds);
 
+        if (openExternallyButton.isVisible()) {
+            toolbarBounds.removeFromRight(10);
+            openExternallyButton.setBounds(toolbarBounds.removeFromRight(39));
+        }
+        searchButton.setBounds(toolbarBounds.removeFromRight(39));
+        searchInput.setBounds(toolbarBounds.reduced(5, 5));
+
         toolbarBounds.removeFromRight(10);
-        auto const searchButtonBounds = toolbarBounds.removeFromRight(39);
-        auto const saveButtonBounds = toolbarBounds.removeFromLeft(39);
+        saveButton.setBounds(toolbarBounds.removeFromLeft(39));
         toolbarBounds.removeFromLeft(10);
-        auto const undoButtonBounds = toolbarBounds.removeFromLeft(39);
+        undoButton.setBounds(toolbarBounds.removeFromLeft(39));
         toolbarBounds.removeFromLeft(10);
-        auto const redoButtonBounds = toolbarBounds.removeFromLeft(39);
-
-        searchInput.setBounds(toolbarBounds.reduced(5, 5));
-
-        searchButton.setBounds(searchButtonBounds);
-        saveButton.setBounds(saveButtonBounds);
-        undoButton.setBounds(undoButtonBounds);
-        redoButton.setBounds(redoButtonBounds);
+        redoButton.setBounds(toolbarBounds.removeFromLeft(39));
 
         auto statusBarBounds = b.removeFromBottom(28);
         editor.setBounds(b);

Source/Objects/LuaObject.h

@@ -1074,7 +1074,7 @@ class LuaObject final : public ObjectBase
         };
 
         auto const scaleFactor = getApproximateScaleFactorForComponent(cnv->editor);
-        textEditor.reset(Dialogs::showTextEditorDialog(fileToOpen.loadFileAsString(), "lua: " + getText(), onClose, onSave, scaleFactor, true));
+        textEditor.reset(Dialogs::showTextEditorDialog(fileToOpen.loadFileAsString(), "lua: " + getText(), onClose, onSave, scaleFactor, true, fileToOpen));
 
         if (textEditor)
             cnv->editor->openTextEditors.add_unique(ptr);
@@ -1230,7 +1230,7 @@ class LuaTextObject final : public TextObjectBase {
         };
 
         auto const scaleFactor = getApproximateScaleFactorForComponent(cnv->editor);
-        textEditor.reset(Dialogs::showTextEditorDialog(fileToOpen.loadFileAsString(), "lua: " + getText(), onClose, onSave, scaleFactor, true));
+        textEditor.reset(Dialogs::showTextEditorDialog(fileToOpen.loadFileAsString(), "lua: " + getText(), onClose, onSave, scaleFactor, true, fileToOpen));
 
         if (textEditor)
             cnv->editor->openTextEditors.add_unique(ptr);

Tests/InspectorTest.h

@@ -133,7 +133,6 @@ class InspectorTest : public PlugDataUnitTest
 
     void finish()
     {
-        ColourPicker::getInstance()->clearSingletonInstance();
         if (auto* sidebar = editor->getSidebarForPanel(Sidebar::InspectorPanel))
             sidebar->clearInspector();