Fix find/replace focus on Windows

Probably this approach could be adopted by all OSes with a little care on the window lifecycle.
arduino · Nov 13, 2017 · 0d50f0b · 0d50f0b
1 parent 62246ba
commit 0d50f0b
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/app/src/cc/arduino/view/findreplace/FindReplace.java b/app/src/cc/arduino/view/findreplace/FindReplace.java
@@ -62,6 +62,10 @@ public FindReplace(Editor editor, Map<String, Object> state) {
     isTranslucencySupported();
     initComponents();
 
+    if (OSUtils.isWindows()) {
+      setAutoRequestFocus(false);
+    }
+
     if (OSUtils.isMacOS()) {
       buttonsContainer.removeAll();
       buttonsContainer.add(replaceAllButton);
@@ -80,6 +84,10 @@ public FindReplace(Editor editor, Map<String, Object> state) {
 
     editor.addWindowListener(new WindowAdapter() {
       public void windowActivated(WindowEvent e) {
+        if (OSUtils.isWindows()) {
+          toFront();
+          return;
+        }
         findField.requestFocusInWindow();
         findField.selectAll();
         setAlwaysOnTop(true);
@@ -89,12 +97,18 @@ public void windowActivated(WindowEvent e) {
         }
       }
       public void windowDeactivated(WindowEvent e) {
+        if (OSUtils.isWindows()) {
+          return;
+        }
         setAlwaysOnTop(false);
       }
     });
 
     addWindowListener(new WindowAdapter() {
       public void windowActivated(WindowEvent e) {
+        if (OSUtils.isWindows()) {
+          return;
+        }
         findField.requestFocusInWindow();
         findField.selectAll();
         setAlwaysOnTop(true);