Merge pull request #518 from devoxx/feat-508

Feat #508 : Always focus on input field when plugin window is activated

Author: stephanj

src/main/java/com/devoxx/genie/ui/component/input/PromptInputArea.java

@@ -7,25 +7,32 @@
 import com.devoxx.genie.ui.topic.AppTopics;
 import com.devoxx.genie.util.MessageBusUtil;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.project.Project;
 
 import com.intellij.openapi.util.SystemInfo;
+import com.intellij.openapi.wm.ToolWindowManager;
+import com.intellij.openapi.wm.ex.ToolWindowManagerListener;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
 import java.util.ResourceBundle;
 
+import static com.devoxx.genie.ui.util.WindowPluginUtil.TOOL_WINDOW_ID;
+
 @Getter
-public class PromptInputArea extends JPanel implements ShortcutChangeListener {
+public class PromptInputArea extends JPanel implements ShortcutChangeListener, ToolWindowManagerListener {
     private final CommandAutoCompleteTextField inputField;
     private final SearchOptionsPanel searchOptionsPanel;
     private final ResourceBundle resourceBundle;
+    private final Project project;
+    private String lastActiveId = null;
 
     public PromptInputArea(Project project, @NotNull ResourceBundle resourceBundle) {
         super(new BorderLayout());
-
+        this.project = project;
         this.resourceBundle = resourceBundle;
 
         // Create main input area panel
@@ -59,8 +66,34 @@ public PromptInputArea(Project project, @NotNull ResourceBundle resourceBundle)
 
         add(inputAreaPanel, BorderLayout.CENTER);
 
+        ApplicationManager.getApplication().invokeLater(inputField::requestFocusInWindow);
+
         MessageBusUtil.subscribe(project.getMessageBus().connect(),
                 AppTopics.SHORTCUT_CHANGED_TOPIC, this);
+
+        // Request focus when tool window is activated or switched from another plugin window
+        project.getMessageBus().connect().subscribe(ToolWindowManagerListener.TOPIC, this);
+    }
+
+    @Override
+    public void stateChanged(@NotNull ToolWindowManager toolWindowManager) {
+        String currentActiveId = null;
+        var activeToolWindowId = toolWindowManager.getActiveToolWindowId();
+
+        if (activeToolWindowId != null) {
+            currentActiveId = activeToolWindowId;
+        }
+
+        // Only focus when our window becomes active from another window
+        if (TOOL_WINDOW_ID.equals(currentActiveId) && !TOOL_WINDOW_ID.equals(lastActiveId)) {
+            ApplicationManager.getApplication().invokeLater(() -> {
+                if (inputField != null && inputField.isDisplayable()) {
+                    inputField.requestFocusInWindow();
+                }
+            }, ModalityState.nonModal());
+        }
+
+        lastActiveId = currentActiveId;
     }
 
     public String getText() {

src/main/resources/META-INF/plugin.xml

@@ -40,6 +40,7 @@
             <LI>Feat #515 : Supports LMStudio BETA /api/v0/ endpoint, collecting window context by @stephanj</LI>
             <LI>Fix #512: Files appear to be added multiple times by @mydeveloperplanet</LI>
             <LI>Feat #514 : Show image icon in file list when images are used by @stephanj</LI>
+            <LI>Feat #508 : Always focus input field when chat window is opened by @stephanj</LI>
         </UL>
         <h2>V0.4.16</h2>
         <UL>