/*\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
// 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
e.printStackTrace();\r
}\r
\r
- if(System.getProperty("os.name").startsWith("Mac"))\r
- MAC = true;\r
\r
alignFrame = af;\r
this.av = av;\r
\r
public void setScrollValues(int x, int y)\r
{\r
+ int width = av.alignment.getWidth();\r
+ int height = av.alignment.getHeight();\r
+\r
+ if(av.hasHiddenColumns)\r
+ width = av.getColumnSelection().findColumnPosition(width);\r
+\r
av.setStartRes(x);\r
av.setStartSeq(y);\r
- av.setEndRes(x + seqPanel.seqCanvas.getSize().width / av.getCharWidth() - 1);\r
+\r
+ av.setEndRes( (x + (seqPanel.seqCanvas.getSize().width / av.charWidth)) -1);\r
\r
hextent = seqPanel.seqCanvas.getSize().width / av.charWidth;\r
vextent = seqPanel.seqCanvas.getSize().height / av.charHeight;\r
\r
- if (hextent > av.alignment.getWidth())\r
+ if (hextent > width)\r
{\r
- hextent = av.alignment.getWidth();\r
+ hextent = width;\r
}\r
- if (vextent > av.alignment.getHeight())\r
+\r
+ if (vextent > height)\r
{\r
- vextent = av.alignment.getHeight();\r
+ vextent = height;\r
}\r
\r
- if (hextent + x > av.getAlignment().getWidth())\r
+ if ( (hextent + x) > width)\r
{\r
- x = av.getAlignment().getWidth() - hextent;\r
+ x = width - hextent;\r
}\r
\r
- if (vextent + y > av.getAlignment().getHeight())\r
+ if ( (vextent + y) > height)\r
{\r
- y = av.getAlignment().getHeight() - vextent;\r
+ y = height - vextent;\r
}\r
\r
if (y < 0)\r
\r
if(overviewPanel!=null)\r
overviewPanel.setBoxPosition();\r
+\r
}\r
\r
public void adjustmentValueChanged(AdjustmentEvent evt)\r
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
\r
if (av.getWrapAlignment())\r
{\r
- int max = av.alignment.getWidth() /\r
- seqPanel.seqCanvas.\r
- getWrappedCanvasWidth(seqPanel.seqCanvas.getSize().width) +1;\r
- vscroll.setMaximum(max);\r
- vscroll.setUnitIncrement(1);\r
- vscroll.setVisibleAmount(1);\r
+ int maxwidth = av.alignment.getWidth();\r
+\r
+ if (av.hasHiddenColumns)\r
+ maxwidth = av.getColumnSelection().findColumnPosition(maxwidth) - 1;\r
+\r
+ int canvasWidth = seqPanel.seqCanvas.getWrappedCanvasWidth\r
+ (seqPanel.seqCanvas.getSize().width);\r
+\r
+ if(canvasWidth>0)\r
+ {\r
+ int max = maxwidth / canvasWidth;\r
+ vscroll.setMaximum(max);\r
+ vscroll.setUnitIncrement(1);\r
+ vscroll.setVisibleAmount(1);\r
+ }\r
}\r
else\r
{\r