summaryrefslogtreecommitdiff
path: root/src/main/java/cuchaz/enigma/gui/Gui.java
diff options
context:
space:
mode:
authorGravatar gegy10002019-06-18 20:20:40 +0200
committerGravatar gegy10002019-06-18 20:20:40 +0200
commit42243fa65e1d87f6a0498f6e2d83505605409411 (patch)
treec4127d7928c752360639b42b221c96678cdc5807 /src/main/java/cuchaz/enigma/gui/Gui.java
parentPlugin rework along with API rework: Enigma split from EnigmaProject; plugins... (diff)
parentfix unwanted declaration navigation during Quick Find (diff)
downloadenigma-fork-42243fa65e1d87f6a0498f6e2d83505605409411.tar.gz
enigma-fork-42243fa65e1d87f6a0498f6e2d83505605409411.tar.xz
enigma-fork-42243fa65e1d87f6a0498f6e2d83505605409411.zip
Mostly resolve test failures
Diffstat (limited to 'src/main/java/cuchaz/enigma/gui/Gui.java')
-rw-r--r--src/main/java/cuchaz/enigma/gui/Gui.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/cuchaz/enigma/gui/Gui.java b/src/main/java/cuchaz/enigma/gui/Gui.java
index f5dd8a0..6fc9fcf 100644
--- a/src/main/java/cuchaz/enigma/gui/Gui.java
+++ b/src/main/java/cuchaz/enigma/gui/Gui.java
@@ -529,16 +529,15 @@ public class Gui {
529 return combo; 529 return combo;
530 } 530 }
531 531
532 public void onCaretMove(int pos) { 532 public void onCaretMove(int pos, boolean fromClick) {
533 EntryRemapper mapper = controller.project.getMapper(); 533 EntryRemapper mapper = controller.project.getMapper();
534
535 Token token = this.controller.getToken(pos); 534 Token token = this.controller.getToken(pos);
536 boolean isToken = token != null; 535 boolean isToken = token != null;
537 536
538 cursorReference = this.controller.getReference(token); 537 cursorReference = this.controller.getReference(token);
539 Entry<?> referenceEntry = cursorReference != null ? cursorReference.entry : null; 538 Entry<?> referenceEntry = cursorReference != null ? cursorReference.entry : null;
540 539
541 if (referenceEntry != null && shouldNavigateOnClick) { 540 if (referenceEntry != null && shouldNavigateOnClick && fromClick) {
542 shouldNavigateOnClick = false; 541 shouldNavigateOnClick = false;
543 Entry<?> navigationEntry = referenceEntry; 542 Entry<?> navigationEntry = referenceEntry;
544 if (cursorReference.context == null) { 543 if (cursorReference.context == null) {
@@ -773,8 +772,9 @@ public class Gui {
773 if (response == JOptionPane.YES_OPTION) { 772 if (response == JOptionPane.YES_OPTION) {
774 this.saveMapping(); 773 this.saveMapping();
775 this.frame.dispose(); 774 this.frame.dispose();
776 } else if (response == JOptionPane.NO_OPTION) 775 } else if (response == JOptionPane.NO_OPTION) {
777 this.frame.dispose(); 776 this.frame.dispose();
777 }
778 778
779 return null; 779 return null;
780 }, "Save and exit", "Discard changes", "Cancel"); 780 }, "Save and exit", "Discard changes", "Cancel");