From 1e9fada0960dc5f73bfb873c358f0c479864aab7 Mon Sep 17 00:00:00 2001 From: gmungoc Date: Thu, 26 Jul 2018 16:42:14 +0100 Subject: [PATCH] JAL-3071 turn off 'mousedDragging' when stopping scrolling --- src/jalview/gui/AnnotationPanel.java | 1 + src/jalview/gui/ScalePanel.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java index 822c6d2..1460985 100755 --- a/src/jalview/gui/AnnotationPanel.java +++ b/src/jalview/gui/AnnotationPanel.java @@ -654,6 +654,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, @Override public void mouseEntered(MouseEvent evt) { + this.mouseDragging = false; ap.getScalePanel().mouseEntered(evt); } diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java index 6a44d06..8771119 100755 --- a/src/jalview/gui/ScalePanel.java +++ b/src/jalview/gui/ScalePanel.java @@ -354,6 +354,7 @@ public class ScalePanel extends JPanel { if (mouseDragging) { + mouseDragging = false; ap.getSeqPanel().stopScrolling(); } } -- 1.7.10.2