From 0c606ba74d4579e30c7cde23dc6546d25092cf17 Mon Sep 17 00:00:00 2001 From: PiTheGuy Date: Fri, 11 Oct 2024 12:47:00 -0500 Subject: [PATCH] Fix navigator --- .../src/main/java/org/quiltmc/enigma/gui/GuiController.java | 2 +- .../java/org/quiltmc/enigma/gui/element/NavigatorPanel.java | 4 ++++ .../main/java/org/quiltmc/enigma/gui/panel/EditorPanel.java | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/GuiController.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/GuiController.java index 032ca0aab..f30def889 100644 --- a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/GuiController.java +++ b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/GuiController.java @@ -548,7 +548,7 @@ private void applyChange0(ValidationContext vc, EntryChange change, boolean u boolean renamed = !change.getDeobfName().isUnchanged(); this.gui.updateStructure(this.gui.getActiveEditor()); if (this.gui.getActiveEditor() != null) { - this.gui.getActiveEditor().onRename(); + this.gui.getActiveEditor().onRename(prev.targetName() == null && mapping.targetName() != null); } if (!Objects.equals(prev.targetName(), mapping.targetName()) || !Objects.equals(prev.tokenType(), mapping.tokenType())) { diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/NavigatorPanel.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/NavigatorPanel.java index dc6fcad3a..28bceb3e4 100644 --- a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/NavigatorPanel.java +++ b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/NavigatorPanel.java @@ -109,6 +109,10 @@ private void wrapIndex() { } } + public void decrementIndex() { + this.currentIndex--; + } + private void tryNavigate() { this.gui.getController().navigateTo(this.entries.get(this.selectedType).get(this.currentIndex)); this.updateStatsLabel(); diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/panel/EditorPanel.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/panel/EditorPanel.java index ca8f15159..e4bb28c08 100644 --- a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/panel/EditorPanel.java +++ b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/panel/EditorPanel.java @@ -208,8 +208,9 @@ public void keyReleased(KeyEvent event) { this.ui.putClientProperty(EditorPanel.class, this); } - public void onRename() { + public void onRename(boolean isNewMapping) { this.navigatorPanel.updateAllTokenTypes(); + if (isNewMapping) this.navigatorPanel.decrementIndex(); } @Nullable