JAL-2388 Hidden cols separated from column selection (almost complete)

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

diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java
index c530fdc..e42d25f 100755 (executable)
--- a/src/jalview/gui/OverviewPanel.java
+++ b/src/jalview/gui/OverviewPanel.java
@@ -115,8 +115,8 @@ public class OverviewPanel extends JPanel implements Runnable
         if (!av.getWrapAlignment())
         {
           od.updateViewportFromMouse(evt.getX(), evt.getY(), av
-                  .getAlignment().getHiddenSequences(), av
-                  .getColumnSelection(), av.getRanges());
+                  .getAlignment().getHiddenSequences(), av.getAlignment()
+                  .getHiddenColumns(), av.getRanges());
           ap.setScrollValues(od.getScrollCol(), od.getScrollRow());
         }
       }
@@ -130,8 +130,8 @@ public class OverviewPanel extends JPanel implements Runnable
         if (!av.getWrapAlignment())
         {
           od.updateViewportFromMouse(evt.getX(), evt.getY(), av
-                  .getAlignment().getHiddenSequences(), av
-                  .getColumnSelection(), av.getRanges());
+                  .getAlignment().getHiddenSequences(), av.getAlignment()
+                  .getHiddenColumns(), av.getRanges());
           ap.setScrollValues(od.getScrollCol(), od.getScrollRow());
         }
       }
@@ -305,7 +305,7 @@ public class OverviewPanel extends JPanel implements Runnable
     }
 
     if (hiddenRow
-            || (hasHiddenCols && !av.getColumnSelection()
+            || (hasHiddenCols && !av.getAlignment().getHiddenColumns()
                     .isVisible(lastcol)))
     {
       color = color.darker().darker();
@@ -322,7 +322,8 @@ public class OverviewPanel extends JPanel implements Runnable
   public void setBoxPosition()
   {
     od.setBoxPosition(av.getAlignment()
-            .getHiddenSequences(), av.getColumnSelection(), av.getRanges());
+.getHiddenSequences(), av
+            .getAlignment().getHiddenColumns(), av.getRanges());
     repaint();
   }