Merge pull request #1940 from alcomposer/command-dismiss-fix

Use the commandID to dismiss the callout box also, no need for a dism…

Source/PluginEditor.cpp

@@ -1259,7 +1259,7 @@ void PluginEditor::getCommandInfo(CommandID const commandID, ApplicationCommandI
     }
     case CommandIDs::ShowCommandInput: {
         result.setInfo("Toggle Command Input", "Enables or disables the command input", "View", 0);
-        result.addDefaultKeypress(KeyPress::F3Key, ModifierKeys::noModifiers);
+        result.addDefaultKeypress(77, ModifierKeys::shiftModifier | ModifierKeys::ctrlModifier);
         result.setActive(true);
         break;
     }

Source/Sidebar/CommandInput.h

@@ -180,10 +180,11 @@ class CommandInput final
 public:
     CommandInput(PluginEditor* editor) : editor(editor)
     {
+        // We need to set the target for the command manager, otherwise it will default to PlugDataApp and fail to find CommandID
+        editor->commandManager.setFirstCommandTarget(editor);
         // Get the application command id key to toggle show/hide of the command prompt
         // We need to know this as the command prompt gets keyboard focus
         // So the command prompt needs to dismiss itself when the CommandID key is pressed
-        // And we want to make sure the user can set this shortcut
         auto* keyMappings = editor->commandManager.getKeyMappings();
         auto keyPresses = keyMappings->getKeyPressesAssignedToCommand(CommandIDs::ShowCommandInput);
         commandIDToggleShowKey = keyPresses.getFirst();
@@ -732,8 +733,8 @@ class CommandInput final
             return true;
         }
         else if (key.getKeyCode() == commandIDToggleShowKey.getKeyCode()) {
-            dismiss();
-            return true;
+            editor->commandManager.invokeDirectly(CommandIDs::ShowCommandInput, false);
+           return true;
         }
         return false;
     }
@@ -829,7 +830,6 @@ class CommandInput final
 
 public:
 
-    std::function<void()> dismiss = [](){};
     std::function<void()> onDismiss = [](){};
 
     static inline const UnorderedSet<String> allAtoms = { "floatbox", "symbolbox", "listbox", "gatom" };

Source/Statusbar.cpp

@@ -1260,23 +1260,21 @@ Statusbar::~Statusbar()
 
 void Statusbar::showCommandInput()
 {
-    if (commandInputCallout)
+    if (commandInputCallout) {
+        commandInputCallout->dismiss();
         return;
+    }
 
     auto commandInput = std::make_unique<CommandInput>(editor);
     auto rawCommandInput = commandInput.get();
     auto& callout = editor->showCalloutBox(std::move(commandInput), commandInputButton->getScreenBounds().removeFromRight(22));
 
-    commandInputCallout = (&callout);
-
-    rawCommandInput->dismiss = [callout_ = SafePointer(&callout)](){
-        if (callout_) {
-            callout_->dismiss();
-        }
-    };
+    commandInputCallout = &callout;
 
     rawCommandInput->onDismiss = [this](){
         // If the mouse is not over the button when callout is closed, the button doesn't know it needs to repaint
+        // This can cause paint glitches on the button if the cursor is not over the button when callout is closed
+        // So we call repaint on the button when the callout is destroyed
         commandInputButton->repaint();
     };
 }