X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FSeqPanel.java;h=70366e490146e9183df9ff512b4923fbcf822fdb;hb=09eebd8c6997a33049084e307078717cc1a693a6;hp=32f0abb189d03585e9dfb0466f03ce6fb83a4d2c;hpb=f5d6c0018555b2c453c2c0354c84cd5d2d81e3b9;p=jalview.git diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java index 32f0abb..70366e4 100644 --- a/src/jalview/appletgui/SeqPanel.java +++ b/src/jalview/appletgui/SeqPanel.java @@ -500,7 +500,6 @@ public class SeqPanel extends Panel implements MouseMotionListener, // For now, ignore the mouseWheel font resizing on Macs // As the Button2_mask always seems to be true - if (Platform.isWinMiddleButton(evt)) { mouseWheelPressed = true; @@ -744,7 +743,7 @@ public class SeqPanel extends Panel implements MouseMotionListener, } @Override - public void highlightSequence(SearchResultsI results) + public String highlightSequence(SearchResultsI results) { if (av.isFollowHighlight()) { @@ -761,7 +760,7 @@ public class SeqPanel extends Panel implements MouseMotionListener, } setStatusMessage(results); seqCanvas.highlightSearchResults(results); - + return null; } @Override @@ -908,7 +907,8 @@ public class SeqPanel extends Panel implements MouseMotionListener, */ List findFeaturesAtColumn(SequenceI sequence, int column) { - return seqCanvas.getFeatureRenderer().findFeaturesAtColumn(sequence, column); + return seqCanvas.getFeatureRenderer().findFeaturesAtColumn(sequence, + column); } Tooltip tooltip; @@ -1196,9 +1196,9 @@ public class SeqPanel extends Panel implements MouseMotionListener, { if (sg.getSize() == av.getAlignment().getHeight()) { - if ((av.hasHiddenColumns() && startres < av.getAlignment() - .getHiddenColumns() - .getNextHiddenBoundary(false, startres))) + if ((av.hasHiddenColumns() + && startres < av.getAlignment().getHiddenColumns() + .getNextHiddenBoundary(false, startres))) { endEditing(); return; @@ -1432,8 +1432,8 @@ public class SeqPanel extends Panel implements MouseMotionListener, } // DETECT RIGHT MOUSE BUTTON IN AWT - if ((evt.getModifiers() - & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK) + if ((evt.getModifiersEx() + & InputEvent.BUTTON3_DOWN_MASK) == InputEvent.BUTTON3_DOWN_MASK) { List allFeatures = findFeaturesAtColumn(sequence, sequence.findPosition(column + 1));