tooltip component: fix exception from malformed tags
This commit is contained in:
@@ -24,6 +24,7 @@
|
||||
*/
|
||||
package net.runelite.client.ui.overlay.components;
|
||||
|
||||
import com.google.common.annotations.VisibleForTesting;
|
||||
import java.awt.Color;
|
||||
import java.awt.Dimension;
|
||||
import java.awt.FontMetrics;
|
||||
@@ -96,6 +97,7 @@ public class TooltipComponent implements RenderableEntity
|
||||
char[] chars = line.toCharArray();
|
||||
|
||||
int begin = 0;
|
||||
boolean inTag = false;
|
||||
for (int j = 0; j < chars.length; j++)
|
||||
{
|
||||
if (chars[j] == '<')
|
||||
@@ -110,8 +112,9 @@ public class TooltipComponent implements RenderableEntity
|
||||
lineX += metrics.stringWidth(text);
|
||||
|
||||
begin = j;
|
||||
inTag = true;
|
||||
}
|
||||
else if (chars[j] == '>')
|
||||
else if (chars[j] == '>' && inTag)
|
||||
{
|
||||
String subLine = line.substring(begin + 1, j);
|
||||
|
||||
@@ -148,6 +151,7 @@ public class TooltipComponent implements RenderableEntity
|
||||
}
|
||||
|
||||
begin = j + 1;
|
||||
inTag = false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -162,12 +166,14 @@ public class TooltipComponent implements RenderableEntity
|
||||
return new Dimension(tooltipWidth + OFFSET * 2, tooltipHeight + OFFSET * 2);
|
||||
}
|
||||
|
||||
private static int calculateTextWidth(FontMetrics metrics, String line)
|
||||
@VisibleForTesting
|
||||
static int calculateTextWidth(FontMetrics metrics, String line)
|
||||
{
|
||||
char[] chars = line.toCharArray();
|
||||
int textWidth = 0;
|
||||
|
||||
int begin = 0;
|
||||
boolean inTag = false;
|
||||
for (int j = 0; j < chars.length; j++)
|
||||
{
|
||||
if (chars[j] == '<')
|
||||
@@ -175,8 +181,9 @@ public class TooltipComponent implements RenderableEntity
|
||||
textWidth += metrics.stringWidth(line.substring(begin, j));
|
||||
|
||||
begin = j;
|
||||
inTag = true;
|
||||
}
|
||||
else if (chars[j] == '>')
|
||||
else if (chars[j] == '>' && inTag)
|
||||
{
|
||||
String subLine = line.substring(begin + 1, j);
|
||||
|
||||
@@ -190,6 +197,7 @@ public class TooltipComponent implements RenderableEntity
|
||||
}
|
||||
|
||||
begin = j + 1;
|
||||
inTag = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user