From 0d3e84a589493514ab5b9eba621d4ff9309ece43 Mon Sep 17 00:00:00 2001
From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Thu, 1 Oct 2009 11:11:04 +0000
Subject: [PATCH] fix so that the popup menu does not trigger a mouse click in
such a way that it selects a new base
git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@11921 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
.../artemis/components/alignment/JamView.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/uk/ac/sanger/artemis/components/alignment/JamView.java b/uk/ac/sanger/artemis/components/alignment/JamView.java
index 15929f5de..71ec5b5ae 100644
--- a/uk/ac/sanger/artemis/components/alignment/JamView.java
+++ b/uk/ac/sanger/artemis/components/alignment/JamView.java
@@ -150,7 +150,7 @@ public class JamView extends JPanel
private boolean showBaseAlignment = false;
- AlphaComposite translucent =
+ private AlphaComposite translucent =
AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.6f);
/** Used to colour the frames. */
@@ -1704,9 +1704,9 @@ public class JamView extends JPanel
**/
private void handleCanvasMouseDragOrClick(final MouseEvent event)
{
- if(event.isShiftDown())
+ if(event.isShiftDown() || event.getButton() == MouseEvent.BUTTON3)
return;
-
+
if(event.getClickCount() > 1)
{
getSelection().clear();
@@ -1714,8 +1714,7 @@ public class JamView extends JPanel
return;
}
- int onmask = MouseEvent.BUTTON1_DOWN_MASK;
-
+ int onmask = MouseEvent.BUTTON1_DOWN_MASK;
String refName = (String) combo.getSelectedItem();
int seqLength = seqLengths.get(refName);
float pixPerBase = getPixPerBaseByWidth();
@@ -1818,7 +1817,10 @@ public class JamView extends JPanel
String maxStr = Integer.toString(max);
FontMetrics fm = getFontMetrics(getFont());
g2.setColor(Color.black);
- g2.drawString(maxStr, getWidth()-fm.stringWidth(maxStr), fm.getHeight());
+
+ int xpos = getWidth() - fm.stringWidth(maxStr) -
+ jspView.getVerticalScrollBar().getWidth();
+ g2.drawString(maxStr, xpos, fm.getHeight());
}
protected void setStartAndEnd(int start, int end)
--
GitLab