Show text editor right-click menu when an object's editor is active (instead of the regular context menu)

Author: timothyschoen

Source/Components/WelcomePanel.h

@@ -845,10 +845,8 @@ class WelcomePanel final : public Component
             for (int i = recentlyOpenedTree.getNumChildren() - 1; i >= 0; i--) {
                 auto subTree = recentlyOpenedTree.getChild(i);
                 auto patchFile = File(subTree.getProperty("Path").toString());
-                if (!File(patchFile).existsAsFile()) {
-                    if (!subTree.hasProperty("Removable")) {
-                        recentlyOpenedTree.removeChild(i, nullptr);
-                    }
+                if (!File(patchFile).existsAsFile() && !subTree.hasProperty("Removable")) {
+                    recentlyOpenedTree.removeChild(i, nullptr);
                 }
             }
 

Source/Object.cpp

@@ -744,7 +744,7 @@ void Object::mouseDown(MouseEvent const& e)
 {
     // Only show right-click menu in locked mode if the object can be opened
     // We don't allow alt+click for popupmenus here, as that will conflict with some object behaviour, like for [range.hsl]
-    if (e.mods.isRightButtonDown() && !cnv->isGraph) {
+    if (e.mods.isRightButtonDown() && !cnv->isGraph && !(gui && gui->isEditorShown())) {
         PopupMenu::dismissAllActiveMenus();
         if (!getValue<bool>(locked)) {
             if (!e.mods.isAnyModifierKeyDown() && !e.mods.isRightButtonDown())

Source/Objects/CommentObject.h

@@ -106,6 +106,7 @@ class CommentObject final : public ObjectBase
     {
         if (editor == nullptr) {
             editor.reset(TextObjectHelper::createTextEditor(object, 15));
+            editor->setLookAndFeel(&object->getLookAndFeel());
             editor->setColour(TextEditor::textColourId, cnv->editor->getLookAndFeel().findColour(PlugDataColour::commentTextColourId));
 
             editor->setBorder(border.addedTo(BorderSize<int>(1, 0, 0, 0)));

Source/Objects/GraphOnParent.h

@@ -116,6 +116,7 @@ class GraphOnParent final : public ObjectBase {
         if (!getValue<bool>(hideNameAndArgs) && editor == nullptr) {
             editor.reset(TextObjectHelper::createTextEditor(object, 13));
 
+            editor->setLookAndFeel(&object->getLookAndFeel());
             editor->setBorder(BorderSize<int>(2, 5, 2, 1));
             editor->setBounds(getLocalBounds().removeFromTop(18));
             editor->setText(getText(), false);

Source/Objects/MessageObject.h

@@ -211,6 +211,7 @@ class MessageObject final : public ObjectBase
         if (editor == nullptr) {
             editor.reset(TextObjectHelper::createTextEditor(object, 15));
 
+            editor->setLookAndFeel(&object->getLookAndFeel());
             editor->setBorder(border);
             editor->setBounds(getLocalBounds().withTrimmedRight(5));
             editor->setText(objectText, false);

Source/Objects/OpenFileObject.h

@@ -27,6 +27,7 @@ class OpenFileObject final : public TextBase {
 
             auto const font = editor->getFont();
             auto const textWidth = font.getStringWidth(objectText) + 20;
+            editor->setLookAndFeel(&object->getLookAndFeel());
             editor->setBorder(border);
             editor->setBounds(getLocalBounds().withWidth(textWidth));
             object->setSize(textWidth + Object::doubleMargin, getHeight() + Object::doubleMargin);

Source/Objects/TextObject.h

@@ -401,6 +401,7 @@ class TextBase : public ObjectBase
         if (editor == nullptr) {
             editor.reset(TextObjectHelper::createTextEditor(object, 15));
 
+            editor->setLookAndFeel(&object->getLookAndFeel());
             editor->setBorder(border.addedTo(BorderSize<int>(0, 0, 1, 0)));
             editor->setBounds(getLocalBounds());
             editor->setText(objectText, false);