X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSeqPanel.java;h=59f239ff460184dca3ce236312d41842f58eedcf;hb=74482724c9ef2ad7a8f71b59291d547ab87b720c;hp=330a9621c54515bb92d20758ad49637c3a58aa60;hpb=d82eea381b4172c4a9d851dee74508429e9394e4;p=jalview.git diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java index 330a962..59f239f 100644 --- a/src/jalview/gui/SeqPanel.java +++ b/src/jalview/gui/SeqPanel.java @@ -22,7 +22,6 @@ package jalview.gui; import jalview.api.AlignViewportI; import jalview.bin.Cache; -import jalview.bin.Jalview; import jalview.commands.EditCommand; import jalview.commands.EditCommand.Action; import jalview.commands.EditCommand.Edit; @@ -824,7 +823,7 @@ public class SeqPanel extends JPanel mouseOverSequence(sequence, column, pos); } - tooltipText.setLength(6); // Cuts the buffer back to + tooltipText.setLength(0); SequenceGroup[] groups = av.getAlignment().findAllGroups(sequence); if (groups != null) @@ -860,7 +859,7 @@ public class SeqPanel extends JPanel seqARep.appendFeatures(tooltipText, pos, features, this.ap.getSeqPanel().seqCanvas.fr); } - if (tooltipText.length() == 6) // + if (tooltipText.length() == 0) // { setToolTipText(null); lastTooltip = null; @@ -877,8 +876,7 @@ public class SeqPanel extends JPanel { formattedTooltipText = JvSwingUtils.wrapTooltip(true, textString); - setToolTipText(formattedTooltipText); - + setToolTipText(formattedTooltipText); lastTooltip = textString; } } @@ -1025,7 +1023,7 @@ public class SeqPanel extends JPanel text.append(" (").append(Integer.toString(residuePos)).append(")"); } - ap.alignFrame.statusBar.setText(text.toString()); + ap.alignFrame.setStatus(text.toString()); } /** @@ -1252,7 +1250,7 @@ public class SeqPanel extends JPanel } message.append(Math.abs(startres - lastres) + " gaps."); - ap.alignFrame.statusBar.setText(message.toString()); + ap.alignFrame.setStatus(message.toString()); // Are we editing within a selection group? if (groupEditing || (sg != null @@ -1767,22 +1765,22 @@ public class SeqPanel extends JPanel } } - if (evt.isPopupTrigger()) // Mac: mousePressed - { - showPopupMenu(evt); - return; - } - /* * defer right-mouse click handling to mouseReleased on Windows * (where isPopupTrigger() will answer true) * NB isRightMouseButton is also true for Cmd-click on Mac */ - if (SwingUtilities.isRightMouseButton(evt) && !Platform.isAMac()) + if (Platform.isWinRightButton(evt)) { return; } + if (evt.isPopupTrigger()) // Mac: mousePressed + { + showPopupMenu(evt); + return; + } + if (av.cursorMode) { seqCanvas.cursorX = findColumn(evt); @@ -2051,11 +2049,11 @@ public class SeqPanel extends JPanel * a drag in ScalePanel or AnnotationPanel */ mouseDragging = true; - if (!av.getWrapAlignment() && mouseDragging && scrollThread == null) + if (!av.getWrapAlignment() && scrollThread == null) { scrollThread = new ScrollThread(); scrollThread.setMousePosition(mousePos); - if (!Jalview.isJS()) + if (!Platform.isJS()) { /* * Java - run in a new thread