From 2341cdeb6fe664fe74657d47c570bc091804131c Mon Sep 17 00:00:00 2001
From: asie
Date: Sat, 15 Jun 2019 08:54:48 +0200
Subject: fix unwanted declaration navigation during Quick Find

---
 .../java/cuchaz/enigma/gui/panels/PanelEditor.java    | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'src/main/java/cuchaz/enigma/gui/panels')

diff --git a/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java b/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java
index ff84648..0a85f0a 100644
--- a/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java
+++ b/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java
@@ -16,13 +16,20 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
 public class PanelEditor extends JEditorPane {
+	private boolean mouseIsPressed = false;
+
 	public PanelEditor(Gui gui) {
 		this.setEditable(false);
 		this.setSelectionColor(new Color(31, 46, 90));
 		this.setCaret(new BrowserCaret());
-		this.addCaretListener(event -> gui.onCaretMove(event.getDot()));
+		this.addCaretListener(event -> gui.onCaretMove(event.getDot(), mouseIsPressed));
 		final PanelEditor self = this;
 		this.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mousePressed(MouseEvent mouseEvent) {
+				mouseIsPressed = true;
+			}
+
 			@Override
 			public void mouseReleased(MouseEvent e) {
 				switch (e.getButton()) {
@@ -38,12 +45,15 @@ public class PanelEditor extends JEditorPane {
 						gui.getController().openNextReference();
 						break;
 				}
+				mouseIsPressed = false;
 			}
 		});
 		this.addKeyListener(new KeyAdapter() {
 			@Override
 			public void keyPressed(KeyEvent event) {
 				if (event.isControlDown()) {
+					gui.setShouldNavigateOnClick(false);
+
 					switch (event.getKeyCode()) {
 						case KeyEvent.VK_I:
 							gui.popupMenu.showInheritanceMenu.doClick();
@@ -81,12 +91,15 @@ public class PanelEditor extends JEditorPane {
 							gui.getController().refreshCurrentClass();
 							break;
 
+						case KeyEvent.VK_F:
+							// prevent navigating on click when quick find activated
+							break;
+
 						default:
+							gui.setShouldNavigateOnClick(true); // CTRL
 							break;
 					}
 				}
-
-				gui.setShouldNavigateOnClick(event.isControlDown());
 			}
 
 			@Override
-- 
cgit v1.2.3