If Mac, use the fillRoundRect method

diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java
index f64843a..fc7232e 100755 (executable)
--- a/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.java
@@ -61,6 +61,8 @@ public class AnnotationPanel extends JPanel implements MouseListener,
     int max; //used by mouseDragged to see if user\r
     boolean mouseDragging = false;\r
 \r
+    boolean MAC = false;\r
+\r
     /**\r
      * Creates a new AnnotationPanel object.\r
      *\r
@@ -68,6 +70,10 @@ public class AnnotationPanel extends JPanel implements MouseListener,
      */\r
     public AnnotationPanel(AlignmentPanel ap)\r
     {\r
+\r
+    if(System.getProperty("os.name").startsWith("Mac"))\r
+      MAC = true;\r
+\r
         ToolTipManager.sharedInstance().registerComponent(this);\r
         ToolTipManager.sharedInstance().setInitialDelay(0);\r
         ToolTipManager.sharedInstance().setDismissDelay(10000);\r
@@ -787,11 +793,21 @@ public class AnnotationPanel extends JPanel implements MouseListener,
                         {\r
                         case 'H':\r
                             g.setColor(HELIX_COLOUR);\r
+                            if(MAC)\r
+                            {\r
+                              //Off by 1 offset when drawing rects and ovals\r
+                              //to offscreen image on the MAC\r
+                              g.fillRoundRect(lastSSX, y + 4 + iconOffset,\r
+                                              x - lastSSX, 7, 8, 8);\r
+                              break;\r
+                            }\r
+\r
                             int sCol = (lastSSX / av.charWidth) + startRes;\r
                             int x1 = lastSSX;\r
                             int x2 = x;\r
 \r
-                           if(row.annotations[sCol-1]==null ||\r
+                           if(sCol==0 ||\r
+                              row.annotations[sCol-1]==null ||\r
                               row.annotations[sCol-1].secondaryStructure!='H')\r
                            {\r
                              g.fillArc(lastSSX, y+4+iconOffset, av.charWidth+1, 7, 90,180) ;\r
@@ -854,12 +870,22 @@ public class AnnotationPanel extends JPanel implements MouseListener,
                 {\r
                 case 'H':\r
                   g.setColor(HELIX_COLOUR);\r
+                  if (MAC)\r
+                  {\r
+                    //Off by 1 offset when drawing rects and ovals\r
+                    //to offscreen image on the MAC\r
+                    g.fillRoundRect(lastSSX, y + 4 + iconOffset,\r
+                                    x - lastSSX, 7, 8, 8);\r
+                    break;\r
+                  }\r
+\r
 \r
                   int sCol = (lastSSX / av.charWidth) + startRes;\r
                   int x1 = lastSSX;\r
                   int x2 = x;\r
 \r
-                 if(row.annotations[sCol-1]==null ||\r
+                 if(sCol==0 ||\r
+                    row.annotations[sCol-1]==null ||\r
                     row.annotations[sCol-1].secondaryStructure!='H')\r
                  {\r
                    g.fillArc(lastSSX, y+4+iconOffset, av.charWidth+1, 7, 90,180) ;\r
@@ -972,7 +998,6 @@ public class AnnotationPanel extends JPanel implements MouseListener,
       if(sRes>aa.annotations.length)\r
         return;\r
 \r
-      eRes = Math.min(eRes, aa.annotations.length);\r
 \r
       int x = 0;\r
 \r
@@ -980,6 +1005,8 @@ public class AnnotationPanel extends JPanel implements MouseListener,
       if(eRes<av.endRes)\r
         eRes++;\r
 \r
+      eRes = Math.min(eRes, aa.annotations.length);\r
+\r
       if(sRes==0)\r
       {\r
         sRes++;\r