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

Dynamic text: new line/paragraph rendering fixed

Browse Source
This commit is contained in:
honfika@gmail.com
2015-02-12 17:53:47 +01:00
parent 7d75d0c4ea
commit bbf33e461c
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java
View File

@@ -883,10 +883,8 @@ public class DefineEditTextTag extends TextTag {
lastWasWhiteSpace = true;
}
} else {
if (c == '\r' || prevChar != '\r') {
if (multiline) {
textModel.newParagraph();
}
if (multiline) {
textModel.newParagraph();
}
}
prevChar = c;
@@ -950,14 +948,21 @@ public class DefineEditTextTag extends TextTag {
textModel.calculateTextWidths();
List<TEXTRECORD> allTextRecords = new ArrayList<>();
int lastHeight = 0;
int yOffset = 0;
for (List<SameStyleTextRecord> line : lines) {
int width = 0;
int currentOffset = 0;
for (SameStyleTextRecord tr : line) {
width += tr.width;
if (tr.style.fontHeight + tr.style.fontLeading > currentOffset) {
currentOffset = tr.style.fontHeight + tr.style.fontLeading;
if (line.isEmpty()) {
currentOffset = lastHeight;
} else {
for (SameStyleTextRecord tr : line) {
width += tr.width;
int lineHeight = tr.style.fontHeight + tr.style.fontLeading;
lastHeight = lineHeight;
if (lineHeight > currentOffset) {
currentOffset = lineHeight;
}
}
}
yOffset += currentOffset;

5
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/dynamictext/DynamicTextModel.java
View File

@@ -50,6 +50,11 @@ public class DynamicTextModel {
public void newParagraph() {
if (paragraph == null) {
// add empty paragraph
paragraph = new Paragraph(this);
paragraphs.add(paragraph);
}
paragraph = null;
}