AlignPanel RefreshPanels put into paintComponent

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

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index 0cbdfbe..98eb180 100755 (executable)
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -59,19 +59,7 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
     scalePanelHolder.add(scalePanel, BorderLayout.CENTER);\r
     seqPanelHolder.add(seqPanel, BorderLayout.CENTER);\r
 \r
-    javax.swing.SwingUtilities.invokeLater(new Runnable()\r
-     {\r
-       public void run()\r
-       {\r
-         invalidate();\r
-         setScrollValues(0,0);\r
-         Dimension d = calculateIdWidth();\r
-         d.setSize( d.width+4, d.height);\r
-         idPanel.idCanvas.setPreferredSize( d );\r
-         RefreshPanels();\r
-       }\r
-    });\r
-\r
+    setScrollValues(0, 0);\r
 \r
     hscroll.addAdjustmentListener(this);\r
     vscroll.addAdjustmentListener(this);\r
@@ -80,7 +68,7 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
    {\r
      public void componentResized(ComponentEvent evt)\r
      {\r
-          RefreshPanels();\r
+          repaint();\r
      }\r
    });\r
 \r
@@ -93,7 +81,7 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
        {\r
          case  27: // escape key\r
            av.setSelectionGroup(null);\r
-           RefreshPanels();\r
+           repaint();\r
            break;\r
          case KeyEvent.VK_X:\r
            if(evt.isControlDown())\r
@@ -203,14 +191,6 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
   {\r
     annotationSpaceFillerHolder.setVisible(b);\r
     annotationScroller.setVisible(b);\r
-    javax.swing.SwingUtilities.invokeLater(new Runnable()\r
-     {\r
-       public void run()\r
-       {\r
-         RefreshPanels();\r
-       }\r
-    });\r
-\r
   }\r
 \r
 \r
@@ -224,13 +204,8 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
     annotationScroller.setVisible(!wrap);\r
     annotationSpaceFillerHolder.setVisible(!wrap);\r
     idSpaceFillerPanel1.setVisible(!wrap);\r
-    javax.swing.SwingUtilities.invokeLater(new Runnable()\r
-     {\r
-       public void run()\r
-       {\r
-         RefreshPanels();\r
-       }\r
-    });\r
+\r
+    repaint();\r
 \r
   }\r
 \r
@@ -255,30 +230,6 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
 \r
     }\r
 \r
-    RefreshPanels();\r
-  }\r
-\r
-\r
-  public void RefreshPanels()\r
-  {\r
-\r
-    Dimension d = idPanel.idCanvas.getPreferredSize();\r
-    idPanelHolder.setPreferredSize(d);\r
-    hscrollFillerPanel.setPreferredSize(new Dimension(d.width, 12));\r
-\r
-    if (av.getWrapAlignment())\r
-    {\r
-      int max = av.alignment.getWidth() / seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth());\r
-      vscroll.setValues(0, 1, 0, max);\r
-    }\r
-    else\r
-    {\r
-      if (overviewPanel != null)\r
-        overviewPanel.updateOverviewImage();\r
-      setScrollValues(av.getStartRes(), av.getStartSeq());\r
-    }\r
-\r
-    validate();\r
     repaint();\r
   }\r
 \r
@@ -403,6 +354,31 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
 \r
   }\r
 \r
+  public void paintComponent(Graphics g)\r
+  {\r
+    invalidate();\r
+\r
+    Dimension d = idPanel.idCanvas.getPreferredSize();\r
+    idPanelHolder.setPreferredSize(d);\r
+    hscrollFillerPanel.setPreferredSize(new Dimension(d.width, 12));\r
+\r
+    if (av.getWrapAlignment())\r
+    {\r
+      int max = av.alignment.getWidth() / seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth());\r
+      vscroll.setMaximum(max);\r
+      vscroll.setUnitIncrement(1);\r
+    }\r
+    else\r
+    {\r
+      if (overviewPanel != null)\r
+        overviewPanel.updateOverviewImage();\r
+      setScrollValues(av.getStartRes(), av.getStartSeq());\r
+    }\r
+\r
+    validate();\r
+\r
+  }\r
+\r
   public int print(Graphics pg, PageFormat pf, int pi) throws PrinterException\r
   {\r
     pg.translate((int)pf.getImageableX(), (int)pf.getImageableY());\r