X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FSeqPanel.java;h=5ecc613e009f7d640ad4fa985a1e7ca22ad19f54;hb=c95df1d1e8746c6fa31b94c2bf8505f25a30c168;hp=5e2f24323d8320bf074727dba52c064ac0afcf04;hpb=174230b4233d9ce80f94527768d2cd2f76da11ab;p=jalview.git

diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java
index 5e2f243..5ecc613 100755
--- a/src/jalview/appletgui/SeqPanel.java
+++ b/src/jalview/appletgui/SeqPanel.java
@@ -322,17 +322,20 @@ public class SeqPanel
      {
        lastMousePress = evt.getPoint();
 
+       //For now, ignore the mouseWheel font resizing on Macs
+       //As the Button2_mask always seems to be true
        if ( (evt.getModifiers() & InputEvent.BUTTON2_MASK) ==
-         InputEvent.BUTTON2_MASK)
+         InputEvent.BUTTON2_MASK && !av.MAC)
        {
          mouseWheelPressed = true;
          return;
        }
 
-       if (evt.isShiftDown() || evt.isAltDown() ||
-           evt.isControlDown())
+       if (evt.isShiftDown()
+           || evt.isControlDown()
+           || evt.isAltDown())
        {
-         if (evt.isAltDown() || evt.isControlDown())
+         if (evt.isControlDown() || evt.isAltDown())
          {
            groupEditing = true;
          }
@@ -412,6 +415,8 @@ public class SeqPanel
 
 
       int cwidth = seqCanvas.getWrappedCanvasWidth(getSize().width);
+      if(cwidth<1)
+        return 0;
 
       wrappedBlock = y / cHeight;
       wrappedBlock += av.getStartRes() / cwidth;
@@ -562,7 +567,9 @@ public class SeqPanel
 
         if (sf.getValue("status") != null )
         {
-          featureText.append(" (" + sf.getValue("status") + ")");
+          String status = sf.getValue("status").toString();
+          if(status.length()>0)
+            featureText.append(" (" + sf.getValue("status") + ")");
         }
         featureText.append("\n");
 
@@ -987,7 +994,7 @@ public class SeqPanel
     {
         seq.insertCharAt(j, av.getGapCharacter());
         seqEditOccurred = true;
-    }
+   }
 
     void insertChar(int j, SequenceI seq, int fixedColumn)
     {
@@ -1029,7 +1036,6 @@ public class SeqPanel
             "End editing: Tried removing residue " + seq.getCharAt(j));
         return;
       }
-
       seq.deleteCharAt(j);
       seq.insertCharAt(fixedColumn, av.getGapCharacter());
       seqEditOccurred = true;