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

linepanelcomponent: remove empty string text component renders

Browse Source
This commit is contained in:
Adam
2020-03-13 23:47:58 -04:00
parent 7672efda3f
commit 7c8095785f
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
runelite-client/src/main/java/net/runelite/client/ui/overlay/components/LineComponent.java
View File

@@ -73,6 +73,7 @@ public class LineComponent implements LayoutableRenderableEntity
int y = baseY; int y = baseY;
final int leftFullWidth = getLineWidth(left, metrics); final int leftFullWidth = getLineWidth(left, metrics);
final int rightFullWidth = getLineWidth(right, metrics); final int rightFullWidth = getLineWidth(right, metrics);
final TextComponent textComponent = new TextComponent();
if (preferredSize.width < leftFullWidth + rightFullWidth) if (preferredSize.width < leftFullWidth + rightFullWidth)
{ {
@@ -92,30 +93,24 @@ public class LineComponent implements LayoutableRenderableEntity
for (int i = 0; i < lineCount; i++) for (int i = 0; i < lineCount; i++)
{ {
String leftText = "";
String rightText = "";
if (i < leftSplitLines.length) if (i < leftSplitLines.length)
{ {
leftText = leftSplitLines[i]; final String leftText = leftSplitLines[i];
textComponent.setPosition(new Point(x, y));
textComponent.setText(leftText);
textComponent.setColor(leftColor);
textComponent.render(graphics);
} }
if (i < rightSplitLines.length) if (i < rightSplitLines.length)
{ {
rightText = rightSplitLines[i]; final String rightText = rightSplitLines[i];
textComponent.setPosition(new Point(x + preferredSize.width - getLineWidth(rightText, metrics), y));
textComponent.setText(rightText);
textComponent.setColor(rightColor);
textComponent.render(graphics);
} }
final TextComponent leftLineComponent = new TextComponent();
leftLineComponent.setPosition(new Point(x, y));
leftLineComponent.setText(leftText);
leftLineComponent.setColor(leftColor);
leftLineComponent.render(graphics);
final TextComponent rightLineComponent = new TextComponent();
rightLineComponent.setPosition(new Point(x + leftSmallWidth + rightSmallWidth - getLineWidth(rightText, metrics), y));
rightLineComponent.setText(rightText);
rightLineComponent.setColor(rightColor);
rightLineComponent.render(graphics);
y += metrics.getHeight(); y += metrics.getHeight();
} }
@@ -125,17 +120,22 @@ public class LineComponent implements LayoutableRenderableEntity
return dimension; return dimension;
} }
final TextComponent leftLineComponent = new TextComponent(); if (!left.isEmpty())
leftLineComponent.setPosition(new Point(x, y)); {
leftLineComponent.setText(left); textComponent.setPosition(new Point(x, y));
leftLineComponent.setColor(leftColor); textComponent.setText(left);
leftLineComponent.render(graphics); textComponent.setColor(leftColor);
textComponent.render(graphics);
}
if (!right.isEmpty())
{
textComponent.setPosition(new Point(x + preferredSize.width - rightFullWidth, y));
textComponent.setText(right);
textComponent.setColor(rightColor);
textComponent.render(graphics);
}
final TextComponent rightLineComponent = new TextComponent();
rightLineComponent.setPosition(new Point(x + preferredSize.width - getLineWidth(right, metrics), y));
rightLineComponent.setText(right);
rightLineComponent.setColor(rightColor);
rightLineComponent.render(graphics);
y += metrics.getHeight(); y += metrics.getHeight();
final Dimension dimension = new Dimension(preferredSize.width, y - baseY); final Dimension dimension = new Dimension(preferredSize.width, y - baseY);