JAL-750 and JAL-451

diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java
index 2fde9ad..1496595 100755 (executable)
--- 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

diff --git a/src/jalview/appletgui/AlignViewport.java b/src/jalview/appletgui/AlignViewport.java
index ed61bc5..cd7857e 100755 (executable)
--- a/src/jalview/appletgui/AlignViewport.java
+++ b/src/jalview/appletgui/AlignViewport.java
@@ -130,7 +130,7 @@ public class AlignViewport implements SelectionSource
 
   boolean ignoreGapsInConsensusCalculation = false;
 
-  jalview.bin.JalviewLite applet;
+  public jalview.bin.JalviewLite applet;
 
   Hashtable sequenceColours;
 
@@ -257,7 +257,11 @@ public class AlignViewport implements SelectionSource
       {
         sortByTree = Boolean.valueOf(param).booleanValue();
       }
-
+      param = applet.getParameter("automaticScrolling");
+      if (param!=null) {
+        followHighlight = Boolean.valueOf(param).booleanValue();
+        followSelection = followHighlight;
+      }
     }
 
     if (applet != null)