Merge pull request #2029 from alcomposer/escape-command-input

Allow esc to exit command input if all objects deselected
plugdata-team · Dec 27, 2024 · 3a3020d · 3a3020d
2 parents d27793b + 6f94d4d
commit 3a3020d
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/Source/Sidebar/CommandInput.h b/Source/Sidebar/CommandInput.h
@@ -790,9 +790,14 @@ class CommandInput final
             return true;
         }
         if (key.getKeyCode() == KeyPress::escapeKey) {
-            if (auto* cnv = editor->getCurrentCanvas())
+            if (auto* cnv = editor->getCurrentCanvas()) {
+                if (cnv->selectedComponents.getNumSelected() == 0) {
+                    editor->commandManager.invokeDirectly(CommandIDs::ShowCommandInput, false);
+                    return true;
+                }
                 cnv->deselectAll();
-            updateCommandInputTarget();
+                updateCommandInputTarget();
+            }
             return true;
         }
         if (key.getKeyCode() == KeyPress::spaceKey) {