diff --git a/CHANGELOG.md b/CHANGELOG.md index 13c0bbbcd..005f55ba8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file. - Flash viewer - filters zooming - Flash viewer - miter strokes - SVG export - miter strokes as miter-clip style +- [#1660] Thumbnail view context menu Remove ## [14.2.1] - 2021-03-13 ### Added @@ -2015,7 +2016,8 @@ All notable changes to this project will be documented in this file. ### Added - Initial public release -[Unreleased]: https://github.com/jindrapetrik/jpexs-decompiler/compare/version14.2.0...Unreleased +[Unreleased]: https://github.com/jindrapetrik/jpexs-decompiler/compare/version14.2.1...Unreleased +[14.2.1]: https://github.com/jindrapetrik/jpexs-decompiler/compare/version14.2.0...version14.2.1 [14.2.0]: https://github.com/jindrapetrik/jpexs-decompiler/compare/version14.1.0...version14.2.0 [14.1.0]: https://github.com/jindrapetrik/jpexs-decompiler/compare/version14.0.1...version14.1.0 [14.0.1]: https://github.com/jindrapetrik/jpexs-decompiler/compare/version14.0.0...version14.0.1 @@ -2125,6 +2127,7 @@ All notable changes to this project will be documented in this file. [alpha 9]: https://github.com/jindrapetrik/jpexs-decompiler/compare/alpha8...alpha9 [alpha 8]: https://github.com/jindrapetrik/jpexs-decompiler/compare/alpha7...alpha8 [alpha 7]: https://github.com/jindrapetrik/jpexs-decompiler/releases/tag/alpha7 +[#1660]: https://www.free-decompiler.com/flash/issues/1660 [#1435]: https://www.free-decompiler.com/flash/issues/1435 [#1488]: https://www.free-decompiler.com/flash/issues/1488 [#1584]: https://www.free-decompiler.com/flash/issues/1584 diff --git a/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java b/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java index 970a38dd2..8ea27b316 100644 --- a/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java +++ b/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java @@ -1364,11 +1364,30 @@ public class TagTreeContextMenu extends JPopupMenu { private void removeItemActionPerformed(ActionEvent evt, boolean removeDependencies) { - TreePath[] tpsArr = tagTree.getSelectionModel().getSelectionPaths(); - if (tpsArr == null) { - return; + TreePath[] tpsArr; + List tps; + if (mainPanel.folderPreviewPanel.selectedItems.isEmpty()) { + tpsArr = tagTree.getSelectionModel().getSelectionPaths(); + if (tpsArr == null) { + return; + } + tps = new ArrayList<>(Arrays.asList(tpsArr)); + } else { + List sel = new ArrayList<>(); + for (TreeItem treeItem : mainPanel.folderPreviewPanel.selectedItems.values()) { + sel.add(treeItem); + tagTree.getAllSubs(treeItem, sel); + } + tps = new ArrayList<>(); + for (TreeItem treeItem : sel) { + tps.add(new TreePath(treeItem)); + //Following code needs TreePath, so convert it without real reason + //Let's hope nobody gets parent of such path + } + if (tps.isEmpty()) { + return; + } } - List tps = new ArrayList<>(Arrays.asList(tpsArr)); List tagsToRemove = new ArrayList<>(); List itemsToRemove = new ArrayList<>();