MAC moved to viewport

diff --git a/src/jalview/appletgui/AlignViewport.java b/src/jalview/appletgui/AlignViewport.java
index 18a4206..0013bc0 100755 (executable)
--- a/src/jalview/appletgui/AlignViewport.java
+++ b/src/jalview/appletgui/AlignViewport.java
@@ -101,6 +101,8 @@ public class AlignViewport
 \r
   jalview.bin.JalviewLite applet;\r
 \r
+  boolean MAC = false;\r
+\r
   public AlignViewport(AlignmentI al, JalviewLite applet)\r
   {\r
     this.applet = applet;\r
@@ -111,6 +113,9 @@ public class AlignViewport
     this.endSeq = al.getHeight() - 1;\r
     setFont(font);\r
 \r
+    if(System.getProperty("os.name").startsWith("Mac"))\r
+      MAC = true;\r
+\r
     if (applet != null)\r
     {\r
       String param = applet.getParameter("showFullId");\r
@@ -462,7 +467,7 @@ public class AlignViewport
 \r
     java.awt.FontMetrics fm = nullFrame.getGraphics().getFontMetrics(font);\r
     setCharHeight(fm.getHeight());\r
-    setCharWidth(fm.charWidth('M'));\r
+    charWidth = fm.charWidth('M');\r
   }\r
 \r
   public Font getFont()\r
@@ -470,11 +475,6 @@ public class AlignViewport
     return font;\r
   }\r
 \r
-  public void setCharWidth(int w)\r
-  {\r
-    this.charWidth = w;\r
-  }\r
-\r
   public int getCharWidth()\r
   {\r
     return charWidth;\r

diff --git a/src/jalview/appletgui/AlignmentPanel.java b/src/jalview/appletgui/AlignmentPanel.java
index dc6b0d5..bcdffa0 100755 (executable)
--- a/src/jalview/appletgui/AlignmentPanel.java
+++ b/src/jalview/appletgui/AlignmentPanel.java
@@ -40,7 +40,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
   // this value is set false when selection area being dragged\r
   boolean fastPaint = true;\r
 \r
-  boolean MAC = false;\r
+\r
 \r
   public AlignmentPanel(AlignFrame af, final AlignViewport av)\r
   {\r
@@ -53,8 +53,6 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
       e.printStackTrace();\r
     }\r
 \r
-    if(System.getProperty("os.name").startsWith("Mac"))\r
-      MAC = true;\r
 \r
     alignFrame = af;\r
     this.av = av;\r
@@ -441,7 +439,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
     int scrollX = av.startRes - oldX;\r
     int scrollY = av.startSeq - oldY;\r
 \r
-    if (av.getWrapAlignment() || !fastPaint || MAC)\r
+    if (av.getWrapAlignment() || !fastPaint || av.MAC)\r
     {\r
       repaint();\r
     }\r