/*\r
* Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
*\r
* This program is free software; you can redistribute it and/or\r
* modify it under the terms of the GNU General Public License\r
{\r
lastMousePress = evt.getPoint();\r
\r
+ //For now, ignore the mouseWheel font resizing on Macs\r
+ //As the Button2_mask always seems to be true\r
if ( (evt.getModifiers() & InputEvent.BUTTON2_MASK) ==\r
- InputEvent.BUTTON2_MASK)\r
+ InputEvent.BUTTON2_MASK && !av.MAC)\r
{\r
mouseWheelPressed = true;\r
return;\r
}\r
\r
- if (evt.isShiftDown() || evt.isAltDown() ||\r
- evt.isControlDown())\r
+ if (evt.isShiftDown()\r
+ || evt.isControlDown()\r
+ || evt.isAltDown())\r
{\r
- if (evt.isAltDown() || evt.isControlDown())\r
+ if (evt.isControlDown() || evt.isAltDown())\r
{\r
groupEditing = true;\r
}\r
\r
\r
int cwidth = seqCanvas.getWrappedCanvasWidth(getSize().width);\r
+ if(cwidth<1)\r
+ return 0;\r
\r
wrappedBlock = y / cHeight;\r
wrappedBlock += av.getStartRes() / cwidth;\r
\r
if (sf.getValue("status") != null )\r
{\r
- featureText.append(" (" + sf.getValue("status") + ")");\r
+ String status = sf.getValue("status").toString();\r
+ if(status.length()>0)\r
+ featureText.append(" (" + sf.getValue("status") + ")");\r
}\r
featureText.append("\n");\r
\r
{\r
seq.insertCharAt(j, av.getGapCharacter());\r
seqEditOccurred = true;\r
- }\r
+ }\r
\r
void insertChar(int j, SequenceI seq, int fixedColumn)\r
{\r
"End editing: Tried removing residue " + seq.getCharAt(j));\r
return;\r
}\r
-\r
seq.deleteCharAt(j);\r
seq.insertCharAt(fixedColumn, av.getGapCharacter());\r
seqEditOccurred = true;\r
av.setSelectionGroup(stretchGroup);\r
}\r
\r
- if (av.cursorMode)\r
- {\r
- seqCanvas.cursorX = findRes(evt);\r
- seqCanvas.cursorY = findSeq(evt);\r
- seqCanvas.repaint();\r
- return;\r
- }\r
-\r
-\r
\r
// DETECT RIGHT MOUSE BUTTON IN AWT\r
if ( (evt.getModifiers() & InputEvent.BUTTON3_MASK) ==\r
this.add(popup);\r
popup.show(this, evt.getX(), evt.getY());\r
ap.repaint();\r
+ return;\r
}\r
- else\r
+\r
+ if (av.cursorMode)\r
{\r
+ seqCanvas.cursorX = findRes(evt);\r
+ seqCanvas.cursorY = findSeq(evt);\r
+ seqCanvas.repaint();\r
+ return;\r
+ }\r
+\r
//Only if left mouse button do we want to change group sizes\r
\r
if (stretchGroup == null)\r
}\r
\r
}\r
-\r
- if (stretchGroup != null && stretchGroup.getEndRes() == res)\r
- {\r
- // Edit end res position of selected group\r
- changeEndRes = true;\r
- }\r
-\r
- else if (stretchGroup != null && stretchGroup.getStartRes() == res)\r
- {\r
- // Edit end res position of selected group\r
- changeStartRes = true;\r
- }\r
- }\r
}\r
\r
public void doMouseReleasedDefineMode(MouseEvent evt)\r