JAL-2388 Corrected overview panel behaviour, updated tests

[jalview.git] / src / jalview / appletgui / OverviewPanel.java

diff --git a/src/jalview/appletgui/OverviewPanel.java b/src/jalview/appletgui/OverviewPanel.java
index 0e22af9..0bb9392 100755 (executable)
--- a/src/jalview/appletgui/OverviewPanel.java
+++ b/src/jalview/appletgui/OverviewPanel.java
@@ -75,7 +75,15 @@ public class OverviewPanel extends Panel implements Runnable,
     sr.forOverview = true;
     fr = new FeatureRenderer(av);
 
-    od = new OverviewDimensions(av);
+    boolean showAnnotation = false;
+    // TODO: in applet this was getSequenceConsensusHash()
+    // check if it makes any functional difference: hconsensus or conservation
+    if (av.getAlignmentConservationAnnotation() == null)
+    {
+      showAnnotation = true;
+    }
+
+    od = new OverviewDimensions(av, showAnnotation);
 
     setSize(new Dimension(od.getWidth(), od.getHeight()));
     addComponentListener(new ComponentAdapter()
@@ -140,7 +148,7 @@ public class OverviewPanel extends Panel implements Runnable,
 
   private void mouseAction(MouseEvent evt)
   {
-    od.setBoxPositionByMouse(evt.getX(), evt.getY());
+    od.updateViewportFromMouse(evt.getX(), evt.getY());
     ap.setScrollValues(od.getScrollCol(), od.getScrollRow());
     ap.paintAlignment(false);
   }