warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: Adds size/style support to gump builders, optimizes EscapeHtml (#2257)

Browse source 
> [!IMPORTANT]
> **Developer Note**
> THIS IS A BREAKING CHANGE TO THE NEW API GUMP.
> Please give us feedback in [discord ](https://muo.gg/discord) if you have issues, need help, or have ideas for a better API change!

### Summary

* Adds support for size/style to dynamic/static builder.
* Drastically simplifies the dynamic/static builder api for AddHtml.
* Cleans up some legacy gump files.
This commit is contained in:
Kamron Batman 2025-11-23 11:35:31 -08:00 • committed by GitHub
parent ea86d5b2a6
commit 7bd5a853a3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
40 changed files with 398 additions and 635 deletions
Download patch file Download diff file Expand all files Collapse all files

71
Projects/UOContent/Text/TextDefinitionExtensions.cs
View file

@ -32,7 +32,7 @@ public static class TextDefinitionExtensions
int stringColor = -1
)
{
if (def == null)
if (def?.IsEmpty != false)
{
return;
}
@ -48,16 +48,28 @@ public static class TextDefinitionExtensions
builder.AddHtmlLocalized(x, y, width, height, def.Number, back, scroll);
}
}
else if (def.String != null)
else if (stringColor != -1)
{
builder.AddHtml(
x,
y,
width,
height,
stringColor >= 0 ? def.String.Color(stringColor) : def.String, // 8 bits per RGB component (24 bit RGB)
back,
scroll
$"<BASEFONT COLOR=#{stringColor:X6}>{def.String}</BASEFONT>",
background: back,
scrollbar: scroll
);
}
else
{
builder.AddHtml(
x,
y,
width,
height,
def.String,
background: back,
scrollbar: scroll
);
}
}
@ -75,7 +87,7 @@ public static class TextDefinitionExtensions
int stringColor = -1
)
{
if (def == null)
if (def?.IsEmpty != false)
{
return;
}
@ -91,16 +103,28 @@ public static class TextDefinitionExtensions
builder.AddHtmlLocalized(x, y, width, height, def.Number, back, scroll);
}
}
else if (def.String != null)
else if (stringColor != -1)
{
builder.AddHtml(
x,
y,
width,
height,
stringColor >= 0 ? def.String.Color(stringColor) : def.String, // 8 bits per RGB component (24 bit RGB)
back,
scroll
$"<BASEFONT COLOR=#{stringColor:X6}>{def.String}</BASEFONT>",
background: back,
scrollbar: scroll
);
}
else
{
builder.AddHtml(
x,
y,
width,
height,
def.String,
background: back,
scrollbar: scroll
);
}
}
@ -118,23 +142,12 @@ public static class TextDefinitionExtensions
int stringColor = -1
)
{
if (def == null)
if (def?.IsEmpty != false)
{
return;
}
if (def.Number > 0)
{
if (numberColor >= 0) // 5 bits per RGB component (15 bit RGB)
{
g.AddHtmlLocalized(x, y, width, height, def.Number, numberColor, back, scroll);
}
else
{
g.AddHtmlLocalized(x, y, width, height, def.Number, back, scroll);
}
}
else if (def.String != null)
if (def.Number <= 0)
{
g.AddHtml(
x,
@ -146,6 +159,14 @@ public static class TextDefinitionExtensions
scroll
);
}
else if (numberColor >= 0) // 5 bits per RGB component (15 bit RGB)
{
g.AddHtmlLocalized(x, y, width, height, def.Number, numberColor, back, scroll);
}
else
{
g.AddHtmlLocalized(x, y, width, height, def.Number, back, scroll);
}
}
public static void AddHtmlText(
@ -162,7 +183,7 @@ public static class TextDefinitionExtensions
int stringColor = -1
)
{
if (def == null)
if (def?.IsEmpty != false)
{
return;
}
@ -172,7 +193,7 @@ public static class TextDefinitionExtensions
// 5 bits per RGB component (15 bit RGB)
g.AddHtmlLocalized(x, y, width, height, def.Number, args, numberColor >= 0 ? numberColor : 0x7FFF, back, scroll);
}
else if (def.String != null)
else
{
g.AddHtml(
x,