Don't cycle objects with tab key if canvas has focus

plugdata-team · Dec 4, 2023 · c1626f1 · c1626f1
1 parent b066d16
commit c1626f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Source/Objects/ObjectImplementations.h b/Source/Objects/ObjectImplementations.h
@@ -722,8 +722,6 @@ class KeycodeObject final : public ImplementationBase
 #if !JUCE_IOS
     void update() override
     {
-
-
         auto* canvas = getMainCanvas(cnv, true);
         if (canvas) {
             attachedEditor = canvas->editor;

diff --git a/Source/PluginEditor.cpp b/Source/PluginEditor.cpp
@@ -1674,7 +1674,10 @@ void PluginEditor::enablePluginMode(Canvas* cnv)
 // it would be annoying to hear the bloop sound for every key that isn't a valid command
 bool PluginEditor::keyPressed(KeyPress const& key)
 {
-    return key.getKeyCode() != KeyPress::tabKey;
+    // Claim tab keys on canvas to prevent cycling selection
+    // The user might want to catch the tab key with an object, this behaviour just gets in the way
+    // We do still want to allow tab cycling on other components, so if canvas doesn't have focus, don't grab the tab key
+    return getCurrentCanvas()->hasKeyboardFocus(true) || key.getKeyCode() != KeyPress::tabKey;
 }
 
 void PluginEditor::commandKeyChanged(bool isHeld)