ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #2720 from Lucwousin/textcomponent

Browse Source 
client: Fix and clean up TextComponent
This commit is contained in:
Owain van Brakel
2020-06-27 17:48:29 +02:00
committed by GitHub
parent 0585b5267b 78cc12205c
commit 36a0ca4118
1 changed files with 27 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
runelite-client/src/main/java/net/runelite/client/ui/overlay/components/TextComponent.java
View File

@@ -55,67 +55,50 @@ public class TextComponent implements RenderableEntity
{ {
final FontMetrics fontMetrics = graphics.getFontMetrics(); final FontMetrics fontMetrics = graphics.getFontMetrics();
if (COL_TAG_PATTERN_W_LOOKAHEAD.matcher(text).find()) final String[] parts = COL_TAG_PATTERN_W_LOOKAHEAD.split(text);
int x = position.x;
for (String part : parts)
{ {
final String[] parts = COL_TAG_PATTERN_W_LOOKAHEAD.split(text); final String notags = Text.removeTags(part);
int x = position.x; final Color col = part.equals(notags) ? color : getColor(part);
for (String part : parts)
{
final String textWithoutCol = Text.removeTags(part);
final String colColor = part.substring(part.indexOf('=') + 1, part.indexOf('>'));
final Color col = Color.decode("#" + colColor);
if (alpha)
{
drawAlpha(graphics, x, position.y, part, col);
}
else
{
drawOutline(graphics, textWithoutCol);
// actual text
graphics.setColor(col);
graphics.drawString(textWithoutCol, x, position.y);
}
x += fontMetrics.stringWidth(textWithoutCol);
}
}
else
{
if (alpha) if (alpha)
{ {
drawAlpha(graphics, position.x, position.y, text, color); drawAlpha(graphics, x, position.y, notags, col);
} }
else else
{ {
drawOutline(graphics, text); drawString(graphics, x, position.y, notags, col);
// actual text
graphics.setColor(color);
graphics.drawString(text, position.x, position.y);
} }
x += fontMetrics.stringWidth(notags);
} }
return new Dimension(fontMetrics.stringWidth(text), fontMetrics.getHeight()); return new Dimension(fontMetrics.stringWidth(Text.removeTags(text)), fontMetrics.getHeight());
} }
private void drawOutline(Graphics2D graphics, String str) private void drawString(Graphics2D graphics, int x, int y, String text, Color color)
{ {
graphics.setColor(Color.BLACK); graphics.setColor(Color.BLACK);
if (outline) if (outline)
{ {
graphics.drawString(str, position.x, position.y + 1); graphics.drawString(text, x, y + 1);
graphics.drawString(str, position.x, position.y - 1); graphics.drawString(text, x, y - 1);
graphics.drawString(str, position.x + 1, position.y); graphics.drawString(text, x + 1, y);
graphics.drawString(str, position.x - 1, position.y); graphics.drawString(text, x - 1, y);
} }
else else
{ {
// shadow // shadow
graphics.drawString(str, position.x + 1, position.y + 1); graphics.drawString(text, x + 1, y + 1);
} }
// actual text
graphics.setColor(color);
graphics.drawString(text, x, y);
} }
private void drawAlpha(Graphics2D graphics, int x, int y, String text, Color color) private void drawAlpha(Graphics2D graphics, int x, int y, String text, Color color)
@@ -145,4 +128,9 @@ public class TextComponent implements RenderableEntity
graphics.setComposite(originalComposite); graphics.setComposite(originalComposite);
} }
private static Color getColor(String from)
{
final String colColor = from.substring(from.indexOf('=') + 1, from.indexOf('>'));
return Color.decode("#" + colColor);
}
} }