import java.awt.event.MouseMotionListener;
import java.beans.PropertyChangeEvent;
+import javax.swing.SwingUtilities;
+
public class OverviewPanel extends Panel implements Runnable,
MouseMotionListener, MouseListener, ViewportListenerI
{
od = new OverviewDimensionsShowHidden(av.getRanges(),
(av.isShowAnnotation()
- && av.getConsensusProfiles() != null));
+ && av.getSequenceConsensusHash() != null));
oviewCanvas = new OverviewCanvas(od, av);
setLayout(new BorderLayout());
if ((evt.getModifiersEx()
& InputEvent.BUTTON3_DOWN_MASK) == InputEvent.BUTTON3_DOWN_MASK)
{
- if (!Platform.isAMac())
+ if (!Platform.isMac()) // BH was excluding JavaScript
{
showPopupMenu(evt);
}
@Override
public void mouseDragged(MouseEvent evt)
{
- if ((evt.getModifiersEx()
- & InputEvent.BUTTON3_DOWN_MASK) == InputEvent.BUTTON3_DOWN_MASK)
+ if (Platform.isWinRightButton(evt))
{
- if (!Platform.isAMac())
- {
- showPopupMenu(evt);
- }
+ showPopupMenu(evt);
+ return;
}
- else
- {
- if (draggingBox)
- {
- // set the mouse position as a fixed point in the box
- // and drag relative to that position
- od.adjustViewportFromMouse(evt.getX(), evt.getY(),
- av.getAlignment().getHiddenSequences(),
- av.getAlignment().getHiddenColumns());
- }
- else
- {
- od.updateViewportFromMouse(evt.getX(), evt.getY(),
- av.getAlignment().getHiddenSequences(),
- av.getAlignment().getHiddenColumns());
- }
- ap.paintAlignment(false, false);
+
+ if (SwingUtilities.isRightMouseButton(evt))
+ {
+ return;
}
+
+ if (draggingBox)
+ {
+ // set the mouse position as a fixed point in the box
+ // and drag relative to that position
+ od.adjustViewportFromMouse(evt.getX(), evt.getY(),
+ av.getAlignment().getHiddenSequences(),
+ av.getAlignment().getHiddenColumns());
+ }
+ else
+ {
+ od.updateViewportFromMouse(evt.getX(), evt.getY(),
+ av.getAlignment().getHiddenSequences(),
+ av.getAlignment().getHiddenColumns());
+ }
+ ap.paintAlignment(false, false);
}
/**