From 5c6da9e852f0dd4de8cc178bca49dddd109b0d96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Mon, 31 Oct 2022 07:19:17 +0100
Subject: [PATCH] Added Allow add tag after header context menu Fixed Disallow
 add tag before header context menu

---
 CHANGELOG.md                                              | 4 ++++
 .../decompiler/flash/gui/tagtree/TagTreeContextMenu.java  | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7508c4c64..f1563afd9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,12 @@
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
+### Added
+- Allow add tag after header context menu
+
 ### Fixed
 - Do not show option to Show in taglist on resource view folders
+- Disallow add tag before header context menu
 
 ## [16.0.0] - 2022-10-30
 ### Added
diff --git a/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java b/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java
index 10ea271ae..ee573f489 100644
--- a/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java
+++ b/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java
@@ -78,6 +78,7 @@ import com.jpexs.decompiler.flash.timeline.TagScript;
 import com.jpexs.decompiler.flash.timeline.Timelined;
 import com.jpexs.decompiler.flash.treeitems.AS3ClassTreeItem;
 import com.jpexs.decompiler.flash.treeitems.FolderItem;
+import com.jpexs.decompiler.flash.treeitems.HeaderItem;
 import com.jpexs.decompiler.flash.treeitems.SWFList;
 import com.jpexs.decompiler.flash.treeitems.TreeItem;
 import com.jpexs.decompiler.flash.types.BUTTONCONDACTION;
@@ -674,7 +675,7 @@ public class TagTreeContextMenu extends JPopupMenu {
 
             TreeItem parent = (TreeItem) tree.getModel().getTreePath(firstItem).getParentPath().getLastPathComponent();
             addTagBeforeMenu.removeAll();
-            if (!isFolder) {
+            if (!isFolder && !(firstItem instanceof HeaderItem)) {
                 addAddTagMenuItems(getAllowedTagTypes(parent), addTagBeforeMenu, firstItem, this::addTagBeforeActionPerformed);
             }
             addTagBeforeMenu.setVisible(addTagBeforeMenu.getItemCount() > 0);
@@ -941,7 +942,7 @@ public class TagTreeContextMenu extends JPopupMenu {
                     }
                 }
             }
-
+            
             if (timelined != null) {
                 if (index == -1) {
                     timelined.addTag(t);
@@ -994,6 +995,9 @@ public class TagTreeContextMenu extends JPopupMenu {
                         }
                     }
                 }
+            } else if (item instanceof HeaderItem) {
+                timelined = swf;
+                index = 0;
             }
 
             if (timelined != null) {