From ad39eec7a5038fbfddea421b91a4a2a8b8529481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sun, 5 Nov 2023 12:39:49 +0100 Subject: [PATCH] Fixed #1193 FLA export - DefineEditText position --- CHANGELOG.md | 3 ++- .../src/com/jpexs/decompiler/flash/xfl/XFLConverter.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17d96e852..58aad7fb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,6 +52,7 @@ All notable changes to this project will be documented in this file. - [#2074], [#2074] Use mxmlc.bat file when exe not available for Flex SDK compilation - FLA export - DefineEditText - allow negative letterspacing - [#2112] GFX - new image types in DefineExternalImage +- [#1193] FLA export - DefineEditText position ### Changed - Basic tag info panel always visible even when nothing to display (to avoid flickering) @@ -3260,6 +3261,7 @@ Major version of SWF to XML export changed to 2. [#2108]: https://www.free-decompiler.com/flash/issues/2108 [#2074]: https://www.free-decompiler.com/flash/issues/2074 [#2112]: https://www.free-decompiler.com/flash/issues/2112 +[#1193]: https://www.free-decompiler.com/flash/issues/1193 [#802]: https://www.free-decompiler.com/flash/issues/802 [#2099]: https://www.free-decompiler.com/flash/issues/2099 [#2090]: https://www.free-decompiler.com/flash/issues/2090 @@ -3663,7 +3665,6 @@ Major version of SWF to XML export changed to 2. [#1172]: https://www.free-decompiler.com/flash/issues/1172 [#1174]: https://www.free-decompiler.com/flash/issues/1174 [#1183]: https://www.free-decompiler.com/flash/issues/1183 -[#1193]: https://www.free-decompiler.com/flash/issues/1193 [#1200]: https://www.free-decompiler.com/flash/issues/1200 [#1198]: https://www.free-decompiler.com/flash/issues/1198 [#1205]: https://www.free-decompiler.com/flash/issues/1205 diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java index 4a17bfb55..751e87ea2 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java @@ -4362,7 +4362,9 @@ public class XFLConverter { writer.writeAttribute("variableName", det.variableName); } writer.writeStartElement("matrix"); - convertMatrix(matrix, writer); + Matrix matrix2 = new Matrix(matrix); + matrix2 = matrix2.preConcatenate(Matrix.getTranslateInstance(det.bounds.Xmin + 40, det.bounds.Ymin + 40)); // 40 is magic value, I don't know why but it's there + convertMatrix(matrix2.toMATRIX(), writer); writer.writeEndElement(); writer.writeStartElement("textRuns"); String txt = "";