hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix duplicate paste position

Browse Source
This commit is contained in:
SiboVG 2022-08-14 20:15:34 +02:00
parent 7bb0363e8b
commit e1a4816e10
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
swing/src/net/sf/openrocket/gui/main/RocketActions.java
View File

@ -851,10 +851,18 @@ public class RocketActions {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
List<RocketComponent> components = selectionModel.getSelectedComponents(); List<RocketComponent> components = selectionModel.getSelectedComponents();
List<RocketComponent> topComponents = new LinkedList<>(); // Components without a parent component in <components>
if (components != null) { if (components != null) {
components.sort(Comparator.comparing(c -> c.getParent() != null ? c.getParent().getChildPosition(c) : 0)); components.sort(Comparator.comparing(c -> c.getParent() != null ? c.getParent().getChildPosition(c) : 0));
components = new ArrayList<>(components); components = new ArrayList<>(components);
fillInMissingSelections(components); fillInMissingSelections(components);
} else {
return;
}
for (RocketComponent c: components) {
if (!RocketComponent.listContainsParent(components, c)) {
topComponents.add(c);
}
} }
Simulation[] sims = selectionModel.getSelectedSimulations(); Simulation[] sims = selectionModel.getSelectedSimulations();
@ -877,7 +885,8 @@ public class RocketActions {
if (RocketComponent.listContainsParent(duplicateComponents, component)) { if (RocketComponent.listContainsParent(duplicateComponents, component)) {
pos = getPastePosition(component, component.getParent()); pos = getPastePosition(component, component.getParent());
} else { } else {
RocketComponent pasteParent = components.get(duplicateComponents.indexOf(component)).getParent(); int compIdx = duplicateComponents.indexOf(component);
RocketComponent pasteParent = topComponents.get(compIdx).getParent();
pos = getPastePosition(component, pasteParent); pos = getPastePosition(component, pasteParent);
} }
positions.add(pos); positions.add(pos);