X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSeqPanel.java;h=20ec5e4f74f38f55a9600eb6dfdca6ac8fce12c9;hb=d14d7360a1855481eadb19536b86253bbc8eccdc;hp=54e3db731b9b6f6870e60d95276ff8dc18bcd31b;hpb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;p=jalview.git diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java index 54e3db7..20ec5e4 100644 --- a/src/jalview/gui/SeqPanel.java +++ b/src/jalview/gui/SeqPanel.java @@ -1175,6 +1175,7 @@ public class SeqPanel extends JPanel final int column = pos.column; final int rowIndex = pos.annotationIndex; + // TODO - get yOffset for annotation, too if (column < 0 || !av.getWrapAlignment() || !av.isShowAnnotation() || rowIndex < 0) { @@ -1183,8 +1184,9 @@ public class SeqPanel extends JPanel AlignmentAnnotation[] anns = av.getAlignment().getAlignmentAnnotation(); String tooltip = AnnotationPanel.buildToolTip(anns[rowIndex], column, - anns); - if (!tooltip.equals(lastTooltip)) + anns, 0, av, ap); + if (tooltip == null ? tooltip != lastTooltip + : !tooltip.equals(lastTooltip)) { lastTooltip = tooltip; lastFormattedTooltip = tooltip == null ? null @@ -1193,7 +1195,7 @@ public class SeqPanel extends JPanel } String msg = AnnotationPanel.getStatusMessage(av.getAlignment(), column, - anns[rowIndex]); + anns[rowIndex], 0, av); ap.alignFrame.setStatus(msg); }