Skip to content

Commit

Permalink
Merge pull request #277 from kpepper/rt649125_plot_popup_branch
Browse files Browse the repository at this point in the history
Fix for RT ticket 649125
  • Loading branch information
kpepper authored Feb 5, 2019
2 parents 960e7e0 + 696c38c commit f4abdff
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
8 changes: 4 additions & 4 deletions etc/versions
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Artemis Release 18.0.1
ACT Release 18.0.1
DNAPlotter Release 18.0.1
BamView 18.0.1
Artemis Release 18.0.2
ACT Release 18.0.2
DNAPlotter Release 18.0.2
BamView 18.0.2
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>uk.ac.sanger</groupId>
<artifactId>artemis</artifactId>
<version>18.0.1</version>
<version>18.0.2</version>

<name>Artemis</name>
<description>Artemis is a free genome browser and annotation tool that allows visualisation of sequence features, next generation data and the results of analyses within the context of the sequence, and also its six-frame translation.
Expand Down
10 changes: 7 additions & 3 deletions src/main/java/uk/ac/sanger/artemis/components/Plot.java
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,12 @@ public int getWindowSize()
{
/**
* Listen for mouse press popup menu and crosshair events.
**/
public void mousePressed(MouseEvent event)
*
* This has been changed to fix RT ticket 649125
* - the pop-up menu was not working on Windows
*/
@Override
public void mouseReleased(MouseEvent event)
{
if(event.isPopupTrigger() || event.isMetaDown())
{
Expand Down Expand Up @@ -515,7 +519,7 @@ public void actionPerformed(ActionEvent e)
else
cancelCrossHairs();

if(event.getClickCount() == 2)
if(event.getClickCount() >= 2)
fireDoubleClickEvent();
else
fireClickEvent();
Expand Down

0 comments on commit f4abdff

Please sign in to comment.