Fixed: #1660 Thumbnail view context menu Remove

This commit is contained in:
Jindra Petřík
2021-03-24 20:36:42 +01:00
parent 5c284cd4aa
commit ba3a21f45e
2 changed files with 27 additions and 5 deletions
@@ -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<TreePath> tps;
if (mainPanel.folderPreviewPanel.selectedItems.isEmpty()) {
tpsArr = tagTree.getSelectionModel().getSelectionPaths();
if (tpsArr == null) {
return;
}
tps = new ArrayList<>(Arrays.asList(tpsArr));
} else {
List<TreeItem> 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<TreePath> tps = new ArrayList<>(Arrays.asList(tpsArr));
List<Tag> tagsToRemove = new ArrayList<>();
List<Object> itemsToRemove = new ArrayList<>();