From bc85daca85163d8d710375c2d663c04bd4d41358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sat, 31 May 2025 12:52:53 +0200 Subject: [PATCH] Added: Disable AS1/2/3 direct editation when editing P-code --- CHANGELOG.md | 1 + src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java | 6 ++++++ .../decompiler/flash/gui/abc/DecompiledEditorPane.java | 3 +++ src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java | 1 + src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java | 4 +++- .../decompiler/flash/gui/editor/LineMarkedEditorPane.java | 2 +- 6 files changed, 15 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82f34163c..94d9656de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ All notable changes to this project will be documented in this file. - AS1/2/3 - underline errors in the code (also in edit mode) - AS1/2/3 - highlight variables and errors on panel next to vertical scrollbar - AS1/2 direct editation - hide P-code panel when editing +- Disable AS1/2/3 direct editation when editing P-code ### Changed - AS1/2 - Single DoAction tag inside frame is now displayed directly as frame node diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java index 3fe6add6c..ec9eec670 100644 --- a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java @@ -216,6 +216,12 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener search(final Openable openable, final String txt, boolean ignoreCase, boolean regexp, boolean pcode, CancellableWorker worker, List scope) { if (txt != null && !txt.isEmpty()) { diff --git a/src/com/jpexs/decompiler/flash/gui/abc/DecompiledEditorPane.java b/src/com/jpexs/decompiler/flash/gui/abc/DecompiledEditorPane.java index e61e02d24..bdd99e982 100644 --- a/src/com/jpexs/decompiler/flash/gui/abc/DecompiledEditorPane.java +++ b/src/com/jpexs/decompiler/flash/gui/abc/DecompiledEditorPane.java @@ -620,6 +620,9 @@ public class DecompiledEditorPane extends DebuggableEditorPane implements CaretL @Override public void caretUpdate(final CaretEvent e) { + if (!isEnabled()) { + return; + } ABC abc = getABC(); if (abc == null) { return; diff --git a/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java index 6e2729f9c..52385f8f3 100644 --- a/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java @@ -207,6 +207,7 @@ public class DetailPanel extends JPanel implements TagEditorPanel { editButton.setVisible(!val); cancelButton.setVisible(val); selectedLabel.setIcon(val ? View.getIcon("editing16") : null); + abcPanel.setDecompiledEditEnabled(!val); } public void showCard(final String name, final Trait trait, int traitIndex, ABC abc) { diff --git a/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java b/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java index 035d67de0..80a4591a1 100644 --- a/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java @@ -1192,7 +1192,9 @@ public class ActionPanel extends JPanel implements SearchListener