From: Jim Procter <jprocter@issues.jalview.org>
Date: Fri, 7 Sep 2018 11:24:10 +0000 (+0100)
Subject: JAL-3105 fix for focus transfer after window closed on OSX
X-Git-Tag: Release_2_10_5~7
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4de960f63bdd1f6b83d91cfcc9e34322b161af4c;p=jalview.git

JAL-3105 fix for focus transfer after window closed on OSX
---

diff --git a/help/html/releases.html b/help/html/releases.html
index a861901..82ec15d 100755
--- a/help/html/releases.html
+++ b/help/html/releases.html
@@ -151,6 +151,10 @@ li:before {
               and lower-case 'E' and 'H' do not automatically get
               treated as RNA secondary structure.
             </li>
+            <li>
+              <!-- JAL-3105 -->Mac Users: closing a window correctly
+              transfers focus to previous window on OSX
+            </li>
           </ul>
           <em>Java 10 Issues</em>
           <ul>
diff --git a/lib/VAqua5.jar b/lib/VAqua5.jar
index b25e343..7b5c27b 100644
Binary files a/lib/VAqua5.jar and b/lib/VAqua5.jar differ
diff --git a/src/jalview/gui/AquaInternalFrameManager.java b/src/jalview/gui/AquaInternalFrameManager.java
index 956c119..7cfac99 100644
--- a/src/jalview/gui/AquaInternalFrameManager.java
+++ b/src/jalview/gui/AquaInternalFrameManager.java
@@ -152,11 +152,12 @@ public class AquaInternalFrameManager extends DefaultDesktopManager
         super.activateFrame(f);
       }
 
-      // If this is the first activation, add to child list.
-      if (fChildFrames.indexOf(f) == -1)
+      // add or relocate to top of stack
+      if (fChildFrames.indexOf(f) != -1)
       {
-        fChildFrames.addElement(f);
+        fChildFrames.remove(f);
       }
+      fChildFrames.addElement(f);
 
       if (fCurrentFrame != null && f != fCurrentFrame)
       {