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

Fixed: #2381 Font color values with alpha allowed in html edittext, but alpha ignored

Browse Source
This commit is contained in:
Jindra Petřík
2024-12-20 12:44:05 +01:00
parent 79042fd098
commit 1d3fbf0f16
4 changed files with 46 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -436,7 +436,17 @@ public class DefineEditTextTag extends TextTag {
String color = unescape(attributes.getValue("color"));
if (color != null) {
if (color.startsWith("#")) {
style.textColor = new RGBA(Color.decode(color));
try {
if (color.length() == 7) { //#rrggbb
style.textColor = new RGBA(Color.decode(color));
} else if (color.length() == 9) { //#aarrggbb
style.textColor = RGBA.fromHexARGB(color);
style.textColor.alpha = 255; //no alpha is allowed
}
} catch (NumberFormatException ex) {
//do not change textColor
}
}
}
String size = unescape(attributes.getValue("size"));

29
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/types/RGBA.java
View File

@@ -20,6 +20,8 @@ import com.jpexs.decompiler.flash.configuration.Configuration;
import com.jpexs.decompiler.flash.types.annotations.SWFType;
import java.awt.Color;
import java.io.Serializable;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* 32-bit red, green, blue and alpha value.
@@ -47,9 +49,9 @@ public class RGBA extends RGB implements Serializable {
* @return Hex string in format #AARRGGBB
*/
public String toHexARGB() {
String ra = Integer.toHexString(alpha);
if (ra.length() < 2) {
ra = "0" + ra;
String ah = Integer.toHexString(alpha);
if (ah.length() < 2) {
ah = "0" + ah;
}
String rh = Integer.toHexString(red);
if (rh.length() < 2) {
@@ -63,7 +65,7 @@ public class RGBA extends RGB implements Serializable {
if (bh.length() < 2) {
bh = "0" + bh;
}
return "#" + ra + rh + gh + bh;
return "#" + ah + rh + gh + bh;
}
/**
@@ -108,6 +110,25 @@ public class RGBA extends RGB implements Serializable {
alpha = 255;
}
}
/**
* Converts hex ARGB to RGBA color
* @param hex Hex color in format #aarrggbb
* @return RGBA color
*/
public static RGBA fromHexARGB(String hex) {
Pattern hexPat = Pattern.compile("^#(?<a>[0-9a-fA-F]{2})(?<r>[0-9a-fA-F]{2})(?<g>[0-9a-fA-F]{2})(?<b>[0-9a-fA-F]{2})$");
Matcher m = hexPat.matcher(hex);
if (!m.matches()) {
throw new NumberFormatException("Not a valid color code with alpha");
}
int a = Integer.parseInt(m.group("a"), 16);
int r = Integer.parseInt(m.group("r"), 16);
int g = Integer.parseInt(m.group("g"), 16);
int b = Integer.parseInt(m.group("b"), 16);
return new RGBA(r, g, b, a);
}
/**
* Constructor.

10
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
View File

@@ -6393,8 +6393,14 @@ public class XFLConverter {
}
String c = attributes.getValue("color");
if (c != null) {
color = c;
colorAlpha = 255;
if (c.matches("^#[0-9a-fA-F]{8}$")) {
color = "#" + c.substring(3);
} else if (c.matches("^#[0-9a-fA-F]{6}$")) {
color = c;
colorAlpha = 255;
} else {
//wrong format, do not change color
}
}
String f = attributes.getValue("face");
if (f != null) {