X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fappletgui%2FAlignFrame.java;h=1496595d641fd42051d0ed363d1a8b3f1a603c97;hb=f7c96b0eada06e354b66a186f272aeb3ff872a90;hp=2fde9ade947021685528ba468e3ae722c83bffb4;hpb=811fb76382f3601b35dc08b8c0ceabed049c3326;p=jalview.git

diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java
index 2fde9ad..1496595 100755
--- a/src/jalview/appletgui/AlignFrame.java
+++ b/src/jalview/appletgui/AlignFrame.java
@@ -70,6 +70,7 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener,
 
     annotationPanelMenuItem.setState(viewport.showAnnotation);
     displayNonconservedMenuItem.setState(viewport.getShowunconserved());
+    followMouseOverFlag.setState(viewport.getFollowHighlight());
 
     seqLimits.setState(viewport.showJVSuffix);
 
@@ -3142,6 +3143,23 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener,
               viewport.applet.getSize().height - embeddedMenu.HEIGHT
                       - statusBar.HEIGHT);
       viewport.applet.add(alignPanel, BorderLayout.CENTER);
+      final AlignFrame me = this;
+      viewport.applet.addFocusListener(new FocusListener()
+      {
+        
+        @Override
+        public void focusLost(FocusEvent e)
+        {
+          if (me.viewport.applet.currentAlignFrame==me) {
+                  me.viewport.applet.currentAlignFrame = null;
+        }}
+        
+        @Override
+        public void focusGained(FocusEvent e)
+        {
+          me.viewport.applet.currentAlignFrame = me;
+        }
+      });
       viewport.applet.validate();
     }
     else