alec/erythros
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

System/Libraries/Html/Renderer: Handle currently supported values for CSS 'font' shorthand property

Browse source
This commit is contained in:
Alec Murphy 2025-05-14 09:36:28 -04:00
parent be691d0c1d
commit e9297f1952
1 changed files with 32 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

34
System/Libraries/Html/Renderer.HC
View file

@ -868,35 +868,39 @@ Bool @apply_css_properties_to_node(@html_dom_node* node, JsonObject* properties)
// node->fontSize = ToI64((Str2I64(node_tmpnum_buf) / 3) * 2);
// }
if (!StrICmp(key->name, "font-size")) {
StrCpy(node_tmpnum_buf, values->@(0));
if (!StrICmp(values->@(0) + StrLen(values->@(0)) - 2, "em")) {
if (!StrICmp(key->name, "font-size") || !StrICmp(key->name, "font")) {
for (j = 0; j < values->length; j++) {
StrCpy(node_tmpnum_buf, values->@(j));
if (!StrICmp(values->@(j) + StrLen(values->@(j)) - 2, "em")) {
node_tmpnum_buf[StrLen(node_tmpnum_buf) - 2] = NULL;
node->fontSize = ToI64(Str2F64(node_tmpnum_buf) * RENDERER_DEFAULT_MAX_LINE_HEIGHT);
}
if (!StrICmp(values->@(0) + StrLen(values->@(0)) - 2, "pt")) {
if (!StrICmp(values->@(j) + StrLen(values->@(j)) - 2, "pt")) {
node_tmpnum_buf[StrLen(node_tmpnum_buf) - 2] = NULL;
node->fontSize = ToI64(Str2F64(node_tmpnum_buf) * 1.33333333);
}
if (!StrICmp(values->@(0) + StrLen(values->@(0)) - 2, "px")) {
if (!StrICmp(values->@(j) + StrLen(values->@(j)) - 2, "px")) {
node_tmpnum_buf[StrLen(node_tmpnum_buf) - 2] = NULL;
node->fontSize = Str2I64(node_tmpnum_buf);
}
}
if (!StrICmp(key->name, "font-weight")) {
if (values->@(0)(U8*)[0] >= '0' && values->@(0)(U8*)[0] <= '9') {
node->fontWeight = Str2I64(values->@(0));
}
if (!StrICmp(values->@(0), "bold")) {
if (!StrICmp(key->name, "font-weight") || !StrICmp(key->name, "font")) {
for (j = 0; j < values->length; j++) {
if (values->@(j)(U8*)[0] >= '0' && values->@(j)(U8*)[0] <= '9') {
node->fontWeight = Str2I64(values->@(j));
}
if (!StrICmp(values->@(j), "bold")) {
node->fontWeight = 700;
}
if (!StrICmp(values->@(0), "normal")) {
if (!StrICmp(values->@(j), "normal")) {
node->fontWeight = 400;
}
}
}
if (!StrICmp(key->name, "font-family")) {
if (!StrICmp(key->name, "font-family") || !StrICmp(key->name, "font")) {
for (j = 0; j < values->length; j++) {
match_font_family = values->@(j);
@ -914,11 +918,13 @@ Bool @apply_css_properties_to_node(@html_dom_node* node, JsonObject* properties)
}
}
if (!StrICmp(key->name, "font-style")) {
if (!StrICmp(values->@(0), "italic")) {
if (!StrICmp(key->name, "font-style") || !StrICmp(key->name, "font")) {
for (j = 0; j < values->length; j++) {
if (!StrICmp(values->@(j), "italic")) {
node->italic = TRUE;
}
}
}
css_continue_to_next_property:
key = key->next;
}