JAL-2388 Corrected overview panel behaviour, updated tests

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

diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java
index e553657..d15ec40 100755 (executable)
--- a/src/jalview/gui/OverviewPanel.java
+++ b/src/jalview/gui/OverviewPanel.java
@@ -88,7 +88,14 @@ public class OverviewPanel extends JPanel implements Runnable
     sr.forOverview = true;
     fr = new FeatureRenderer(alPanel);
 
-    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);
 
     addComponentListener(new ComponentAdapter()
     {
@@ -112,7 +119,7 @@ public class OverviewPanel extends JPanel implements Runnable
         {
           // TODO: feature: jv2.5 detect shift drag and update selection from
           // it.
-          od.setBoxPositionByMouse(evt.getX(), evt.getY());
+          od.updateViewportFromMouse(evt.getX(), evt.getY());
           ap.setScrollValues(od.getScrollCol(), od.getScrollRow());
         }
       }
@@ -125,7 +132,7 @@ public class OverviewPanel extends JPanel implements Runnable
       {
         if (!av.getWrapAlignment())
         {
-          od.setBoxPositionByMouse(evt.getX(), evt.getY());
+          od.updateViewportFromMouse(evt.getX(), evt.getY());
           ap.setScrollValues(od.getScrollCol(), od.getScrollRow());
         }
       }