LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-06 13:15:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: #2470 Transform - paste matrix, edit current matrix not working

Browse Source 
Fixed: Do not allow to switch PlaceObjects in transform mode
This commit is contained in:
Jindra Petřík
2025-06-19 17:00:42 +02:00
parent 6aea1a3083
commit 48ef2e88ec
5 changed files with 53 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/jpexs/decompiler/flash/gui/TransformPanel.java
View File

@@ -425,7 +425,7 @@ public class TransformPanel extends JPanel {
@Override
public void itemStateChanged(ItemEvent e) {
if (matrixEditCurrentCheckBox.isSelected()) {
Matrix matrix = imagePanel.getNewMatrix();
Matrix matrix = imagePanel.getOriginalMatrix().concatenate(imagePanel.getNewMatrix());
matrixATextField.setText(formatDouble(matrix.scaleX));
matrixBTextField.setText(formatDouble(matrix.rotateSkew0));
matrixCTextField.setText(formatDouble(matrix.rotateSkew1));
@@ -491,7 +491,7 @@ public class TransformPanel extends JPanel {
}
}
if (matrixEditCurrentCheckBox.isSelected()) {
Matrix matrix = imagePanel.getNewMatrix();
Matrix matrix = imagePanel.getOriginalMatrix().concatenate(imagePanel.getNewMatrix());
matrixATextField.setText(formatDouble(matrix.scaleX));
matrixBTextField.setText(formatDouble(matrix.rotateSkew0));
matrixCTextField.setText(formatDouble(matrix.rotateSkew1));
@@ -527,7 +527,7 @@ public class TransformPanel extends JPanel {
}
private void copyClipboardActionPerformed(ActionEvent e) {
Matrix matrix = imagePanel.getNewMatrix();
Matrix matrix = imagePanel.getOriginalMatrix().concatenate(imagePanel.getNewMatrix());
String copyString = "MATRIX[" + matrix.scaleX + "," + matrix.rotateSkew0 + "," + matrix.rotateSkew1 + "," + matrix.scaleY + "," + matrix.translateX + "," + matrix.translateY + "]";
StringSelection stringSelection = new StringSelection(copyString);
Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
@@ -552,8 +552,7 @@ public class TransformPanel extends JPanel {
matrix.translateX = Double.parseDouble(matcher.group("translateX"));
matrix.translateY = Double.parseDouble(matcher.group("translateY"));
matrix = imagePanel.getNewMatrix().inverse().concatenate(matrix);
imagePanel.applyTransformMatrix(matrix);
imagePanel.setFullTransformMatrix(matrix);
}
}
}
@@ -688,9 +687,10 @@ public class TransformPanel extends JPanel {
matrix.translateX = parseDouble(matrixETextField.getText());
matrix.translateY = parseDouble(matrixFTextField.getText());
if (matrixEditCurrentCheckBox.isSelected()) {
matrix = imagePanel.getNewMatrix().inverse().concatenate(matrix);
imagePanel.setFullTransformMatrix(matrix);
} else {
imagePanel.applyTransformMatrix(matrix);
}
imagePanel.applyTransformMatrix(matrix);
} catch (NumberFormatException nfe) {
//ignored
}