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

Merge pull request #1665 from SiboVG/issue-1663

Browse Source 
[#1663] Fix duplicate scaling of multi-selection children
This commit is contained in:
SiboVG 2022-09-12 12:45:08 +02:00 committed by GitHub
commit f1ebc279b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
swing/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java
View File

@ -527,8 +527,10 @@ public class ScaleDialog extends JDialog {
// they were also part of selection) // they were also part of selection)
List<RocketComponent> scaledComponents = new ArrayList<>(); List<RocketComponent> scaledComponents = new ArrayList<>();
for (RocketComponent component : selection) { for (RocketComponent component : selection) {
scale(component, mul, scaleMass, scaleOffsets.isSelected()); if (!scaledComponents.contains(component)) {
scaledComponents.add(component); scale(component, mul, scaleMass, scaleOffsets.isSelected());
scaledComponents.add(component);
}
if (component.getChildCount() > 0) { if (component.getChildCount() > 0) {
scaleChildren(component, scaledComponents, mul, scaleMass); scaleChildren(component, scaledComponents, mul, scaleMass);