Merge branch 'develop' into trialMerge

[jalview.git] / src / jalview / appletgui / OverviewPanel.java

diff --git a/src/jalview/appletgui/OverviewPanel.java b/src/jalview/appletgui/OverviewPanel.java
index 4e69399..ddb49f1 100755 (executable)
--- a/src/jalview/appletgui/OverviewPanel.java
+++ b/src/jalview/appletgui/OverviewPanel.java
@@ -116,8 +116,8 @@ public class OverviewPanel extends Panel implements Runnable,
   @Override
   public void mouseClicked(MouseEvent evt)
   {
-    if ((evt.getModifiers()
-            & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
+    if ((evt.getModifiersEx()
+            & InputEvent.BUTTON3_DOWN_MASK) == InputEvent.BUTTON3_DOWN_MASK)
     {
       showPopupMenu(evt);
     }
@@ -142,8 +142,8 @@ public class OverviewPanel extends Panel implements Runnable,
   @Override
   public void mousePressed(MouseEvent evt)
   {
-    if ((evt.getModifiers()
-            & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
+    if ((evt.getModifiersEx()
+            & InputEvent.BUTTON3_DOWN_MASK) == InputEvent.BUTTON3_DOWN_MASK)
     {
       if (!Platform.isMac()) // BH was excluding JavaScript
       {
@@ -187,10 +187,14 @@ public class OverviewPanel extends Panel implements Runnable,
   @Override
   public void mouseDragged(MouseEvent evt)
   {
-    if (Platform.isWinRightButton(evt)) 
+    if (Platform.isWinRightButton(evt))
     {
-       showPopupMenu(evt);
-       return;
+      if ((evt.getModifiersEx()
+              & InputEvent.BUTTON3_DOWN_MASK) == InputEvent.BUTTON3_DOWN_MASK)
+      {
+       showPopupMenu(evt);
+       return;
+      }
     }
 
     if (SwingUtilities.isRightMouseButton(evt))