Highlight hidden columns after revealing

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

diff --git a/src/jalview/gui/ColumnSelection.java b/src/jalview/gui/ColumnSelection.java
index 55c055c..eb6cafe 100755 (executable)
--- a/src/jalview/gui/ColumnSelection.java
+++ b/src/jalview/gui/ColumnSelection.java
@@ -171,6 +171,23 @@ public class ColumnSelection
                 selected.setElementAt(new Integer(temp - change), i);\r
             }\r
         }\r
+\r
+        if(hiddenColumns!=null)\r
+        {\r
+          for(int i=0; i<hiddenColumns.size(); i++)\r
+          {\r
+            int[] region = (int[]) hiddenColumns.elementAt(i);\r
+            if(region[0] > start)\r
+            {\r
+              region[0] -= change;\r
+              region[1] -= change;\r
+            }\r
+            if(region[0]<0)\r
+              region[0] = 0;\r
+            if(region[1] <0)\r
+             region[1] = 0;\r
+          }\r
+        }\r
     }\r
 \r
     /**\r
@@ -350,6 +367,14 @@ public class ColumnSelection
 \r
     public void revealAllHiddenColumns(AlignViewport av)\r
     {\r
+      for(int i=0; i<hiddenColumns.size(); i++)\r
+      {\r
+        int [] region = (int[])hiddenColumns.elementAt(i);\r
+        for(int j=region[0]; j<region[1]; j++)\r
+        {\r
+          addElement(j);\r
+        }\r
+      }\r
       av.hasHiddenColumns = false;\r
       hiddenColumns = null;\r
     }\r
@@ -361,6 +386,11 @@ public class ColumnSelection
         int [] region = (int[])hiddenColumns.elementAt(i);\r
         if( res == region[0])\r
         {\r
+          for (int j = region[0]; j < region[1]; j++)\r
+          {\r
+            addElement(j);\r
+          }\r
+\r
           hiddenColumns.remove(region);\r
           break;\r
         }\r