X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAnnotationLabels.java;h=ce50cee9a54ab1575a2fd1e69e79b297aabb8bd2;hb=cf491d18e6affbfacfc67eda7c6bceedd457982f;hp=f2881889cf600ac72b569a81473d2197d30db63d;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git diff --git a/src/jalview/appletgui/AnnotationLabels.java b/src/jalview/appletgui/AnnotationLabels.java index f288188..ce50cee 100755 --- a/src/jalview/appletgui/AnnotationLabels.java +++ b/src/jalview/appletgui/AnnotationLabels.java @@ -311,8 +311,8 @@ public class AnnotationLabels extends Panel implements ActionListener, .getSize(), f = ap.seqPanelHolder.getSize(); int dif = evt.getY() - oldY; - dif /= ap.av.charHeight; - dif *= ap.av.charHeight; + dif /= ap.av.getCharHeight(); + dif *= ap.av.getCharHeight(); if ((d.height - dif) > 20 && (f.height + dif) > 20) { @@ -482,7 +482,7 @@ public class AnnotationLabels extends Panel implements ActionListener, MessageManager.getString("label.ignore_gaps_consensus"), (aa[selectedRow].groupRef != null) ? aa[selectedRow].groupRef .getIgnoreGapsConsensus() : ap.av - .getIgnoreGapsConsensus()); + .isIgnoreGapsConsensus()); final AlignmentAnnotation aaa = aa[selectedRow]; cbmi.addItemListener(new ItemListener() { @@ -495,7 +495,7 @@ public class AnnotationLabels extends Panel implements ActionListener, } else { - ap.av.setIgnoreGapsConsensus(cbmi.getState()); + ap.av.setIgnoreGapsConsensus(cbmi.getState(), ap); } ap.paintAlignment(true); } @@ -813,7 +813,7 @@ public class AnnotationLabels extends Panel implements ActionListener, dragEvent.getY()); } - if (!av.wrapAlignment && ((aa == null) || (aa.length < 1))) + if (!av.getWrapAlignment() && ((aa == null) || (aa.length < 1))) { g.setColor(Color.black); g.drawString(MessageManager.getString("label.right_click"), 2, 8);