From 267285afe1e8d367f87125d3bdd3ac42e9d7c0f7 Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Thu, 26 Jan 2017 18:43:32 +0000
Subject: [PATCH] - Forge defocusing solution: part 2 [code contribution by
 nefigah]. Fixes defocusing on window pop-ups such as Goblin Guide.

---
 .../screens/match/controllers/CPrompt.java    | 41 +++++++++++++++++--
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CPrompt.java b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CPrompt.java
index ba31d597a85..5975246ad80 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CPrompt.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CPrompt.java
@@ -23,6 +23,10 @@ import java.awt.event.ActionListener;
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.Window;
+import java.awt.Dialog;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 
@@ -72,12 +76,30 @@ public class CPrompt implements ICDoc {
         }
     };
 
+    private final WindowAdapter focusOKButtonOnDialogClose = new WindowAdapter() {
+        @Override
+        public void windowClosed(WindowEvent evt) {
+            view.getBtnOK().requestFocusInWindow();
+        }
+    };
+
     private final PropertyChangeListener focusOnEnable = new PropertyChangeListener() {
         @Override
         public void propertyChange(PropertyChangeEvent evt) {
-            boolean isEnabled = (Boolean) evt.getNewValue();
-            if (isEnabled && (lastFocusedButton == null || lastFocusedButton == view.getBtnOK())) {
-                view.getBtnOK().requestFocusInWindow();
+            if (lastFocusedButton == null || lastFocusedButton == view.getBtnOK()) {
+                // Attempt to resolve sporadic button focus issues when dialogs are shown.
+                Dialog activeDialog = getActiveDialog(true);
+                if (activeDialog != null) {
+                    // If this dialog already has our listener, remove it
+                    activeDialog.removeWindowListener(focusOKButtonOnDialogClose);
+                    activeDialog.addWindowListener(focusOKButtonOnDialogClose);
+                }
+
+                // Focus the OK button when it becomes enabled
+                boolean isEnabled = (Boolean) evt.getNewValue();
+                if (isEnabled) {
+                    view.getBtnOK().requestFocusInWindow();
+                }
             }
         }
     };
@@ -110,6 +132,19 @@ public class CPrompt implements ICDoc {
         _initButton(view.getBtnOK(), actOK);
     }
 
+    private static Dialog getActiveDialog(boolean modalOnly)
+    {
+        Window[] windows = Window.getWindows();
+        if (windows != null) {
+            for (Window w : windows) {
+                if (w.isShowing() && w instanceof Dialog && (!modalOnly || ((Dialog)w).isModal())) {
+                    return (Dialog)w;
+                }
+            }
+        }
+        return null;
+    }
+
     private void selectButtonOk() {
         matchUI.getGameController().selectButtonOk();
     }