LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-10 19:53:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #1748 Line height - Descent/ascent in multiline DefineEditText

Browse Source
This commit is contained in:
Jindra Petřík
2021-11-17 20:22:28 +01:00
parent 6f5602ac60
commit b2b749db81
11 changed files with 340 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1123,7 +1123,8 @@ public class DefineEditTextTag extends TextTag {
List<TEXTRECORD> allTextRecords = new ArrayList<>();
int lastHeight = 0;
int yOffset = -leading;
int yOffset = 0;
boolean firstLine = true;
for (List<SameStyleTextRecord> line : lines) {
int width = 0;
int currentOffset = 0;
@@ -1132,13 +1133,17 @@ public class DefineEditTextTag extends TextTag {
} else {
for (SameStyleTextRecord tr : line) {
width += tr.width;
int lineHeight = tr.style.fontHeight + tr.style.fontLeading;
int lineHeight = (int) Math.round(tr.style.fontHeight * tr.style.font.getAscent() / tr.style.font.getDivider() / 1024.0) + tr.style.fontLeading;
if (tr.style.font != null && !firstLine) {
lineHeight += (int) Math.round(tr.style.fontHeight * tr.style.font.getDescent() / tr.style.font.getDivider() / 1024.0);
}
lastHeight = lineHeight;
if (lineHeight > currentOffset) {
currentOffset = lineHeight;
}
}
}
firstLine = false;
yOffset += currentOffset;
int alignOffset = 0;
switch (align) {