X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdPanel.java;h=3c7e06fcb302fc6b66c9f30380823c50cad3a3c3;hb=36cb7e0a22de94370c4397d1d7feffcfe72a88fc;hp=35fd1b499dfce71830f7e9593aa1d397350690e6;hpb=a57976ba40e1abe6d7c1940386e1a25419ef9c9d;p=jalview.git diff --git a/src/jalview/gui/IdPanel.java b/src/jalview/gui/IdPanel.java index 35fd1b4..3c7e06f 100755 --- a/src/jalview/gui/IdPanel.java +++ b/src/jalview/gui/IdPanel.java @@ -108,8 +108,7 @@ public class IdPanel extends JPanel SequenceI sequence = av.getAlignment().getSequenceAt(seq); StringBuilder tip = new StringBuilder(64); seqAnnotReport.createTooltipAnnotationReport(tip, sequence, - av.isShowDBRefs(), av.isShowNPFeats(), - sp.seqCanvas.fr.getMinMax()); + av.isShowDBRefs(), av.isShowNPFeats(), sp.seqCanvas.fr); setToolTipText(JvSwingUtils.wrapTooltip(true, sequence.getDisplayId(true) + " " + tip.toString())); } @@ -148,24 +147,25 @@ public class IdPanel extends JPanel public void mouseWheelMoved(MouseWheelEvent e) { e.consume(); - if (e.getWheelRotation() > 0) + double wheelRotation = e.getPreciseWheelRotation(); + if (wheelRotation > 0) { if (e.isShiftDown()) { av.getRanges().scrollRight(true); } - else if (!av.getWrapAlignment()) + else { av.getRanges().scrollUp(false); } } - else + else if (wheelRotation < 0) { if (e.isShiftDown()) { av.getRanges().scrollRight(false); } - else if (!av.getWrapAlignment()) + else { av.getRanges().scrollUp(true); } @@ -430,10 +430,11 @@ public class IdPanel extends JPanel */ public void highlightSearchResults(List list) { - getIdCanvas().setHighlighted(list); + av.setHighlightedSeqs(list); if (list == null) { + idCanvas.repaint(); return; } @@ -445,6 +446,11 @@ public class IdPanel extends JPanel { av.getRanges().setStartSeq(index); } + else + { + // just repaint + idCanvas.repaint(); + } } public IdCanvas getIdCanvas()