Format label left align

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

diff --git a/src/jalview/appletgui/AlignmentPanel.java b/src/jalview/appletgui/AlignmentPanel.java
index 5e09da7..cf383ac 100755 (executable)
--- a/src/jalview/appletgui/AlignmentPanel.java
+++ b/src/jalview/appletgui/AlignmentPanel.java
@@ -44,8 +44,13 @@ public class AlignmentPanel
   // this value is set false when selection area being dragged\r
   boolean fastPaint = true;\r
 \r
+  boolean MAC = false;\r
+\r
   public AlignmentPanel(AlignFrame af, final AlignViewport av)\r
   {\r
+    if(System.getProperty("os.name").startsWith("Mac"))\r
+      MAC = true;\r
+\r
     alignFrame = af;\r
     this.av = av;\r
     seqPanel = new SeqPanel(av, this);\r
@@ -167,6 +172,9 @@ public class AlignmentPanel
     hscrollFillerPanel.setSize(d);\r
 \r
     alignFrame.pack();\r
+\r
+    if(overviewPanel!=null)\r
+          overviewPanel.updateOverviewImage();\r
   }\r
 \r
   public void setIdWidth(int w, int h)\r
@@ -274,6 +282,7 @@ public class AlignmentPanel
 \r
   public void setWrapAlignment(boolean wrap)\r
   {\r
+    av.startSeq = 0;\r
     scalePanelHolder.setVisible(!wrap);\r
     hscroll.setVisible(!wrap);\r
     idwidthAdjuster.setVisible(!wrap);\r
@@ -288,29 +297,6 @@ public class AlignmentPanel
 \r
   }\r
 \r
-  public void setColourScheme()\r
-  {\r
-    ColourSchemeI cs = av.getGlobalColourScheme();\r
-\r
-    if (av.getConservationSelected())\r
-    {\r
-\r
-      Alignment al = (Alignment) av.getAlignment();\r
-      Conservation c = new Conservation("All",\r
-                                        ResidueProperties.propHash, 3,\r
-                                        al.getSequences(), 0,\r
-                                        al.getWidth());\r
-\r
-      c.calculate();\r
-      c.verdict(false, av.ConsPercGaps);\r
-      ConservationColourScheme ccs = new ConservationColourScheme(c, cs);\r
-\r
-      av.setGlobalColourScheme(ccs);\r
-\r
-    }\r
-\r
-    repaint();\r
-  }\r
 \r
   int hextent = 0;\r
   int vextent = 0;\r
@@ -452,7 +438,7 @@ public class AlignmentPanel
       overviewPanel.setBoxPosition();\r
     }\r
 \r
-    if (av.getWrapAlignment() || !fastPaint)\r
+    if (av.getWrapAlignment() || !fastPaint || MAC)\r
     {\r
       repaint();\r
     }\r
@@ -482,13 +468,8 @@ public class AlignmentPanel
     idPanel.idCanvas.setSize(d.width, seqPanel.seqCanvas.getSize().height);\r
     annotationSpaceFillerHolder.setSize(d.width,\r
                                         annotationPanel.getSize().height);\r
-    alabels.setSize(d.width, annotationPanel.getSize().height);\r
 \r
-    alabels.repaint();\r
-    idPanel.idCanvas.repaint();\r
-    seqPanel.seqCanvas.repaint();\r
-    scalePanel.repaint();\r
-    annotationPanel.repaint();\r
+    alabels.setSize(d.width, annotationPanel.getSize().height);\r
 \r
     if (av.getWrapAlignment())\r
     {\r
@@ -504,5 +485,11 @@ public class AlignmentPanel
       setScrollValues(av.getStartRes(), av.getStartSeq());\r
     }\r
 \r
+    alabels.repaint();\r
+    idPanel.idCanvas.repaint();\r
+    seqPanel.seqCanvas.repaint();\r
+    scalePanel.repaint();\r
+    annotationPanel.repaint();\r
+\r
   }\r
 }\r