From 728a40ae5081ee8c7951408cdee5e4db0b70fbb1 Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Tue, 2 Jul 2019 13:48:03 +0100 Subject: [PATCH] update corp overlay update corp overlay to follow new table building practice --- .../plugins/corp/CorpDamageOverlay.java | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpDamageOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpDamageOverlay.java index abc6d7578e..f76feec525 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpDamageOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpDamageOverlay.java @@ -43,8 +43,10 @@ import net.runelite.client.ui.overlay.OverlayMenuEntry; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.components.ComponentConstants; -import net.runelite.client.ui.overlay.components.LineComponent; import net.runelite.client.ui.overlay.components.PanelComponent; +import net.runelite.client.ui.overlay.components.table.TableAlignment; +import net.runelite.client.ui.overlay.components.table.TableComponent; +import net.runelite.client.util.ColorUtil; class CorpDamageOverlay extends Overlay { @@ -90,6 +92,8 @@ class CorpDamageOverlay extends Overlay int damageForKill = players != 0 ? totalDamage / players : 0; panelComponent.getChildren().clear(); + TableComponent tableComponent = new TableComponent(); + tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT); NPC core = corpPlugin.getCore(); if (core != null) @@ -114,27 +118,17 @@ class CorpDamageOverlay extends Overlay int textWidth = Math.max(ComponentConstants.STANDARD_WIDTH, fontMetrics.stringWidth(text)); panelComponent.setPreferredSize(new Dimension(textWidth, 0)); - panelComponent.getChildren().add(LineComponent.builder() - .left(text) - .leftColor(Color.RED) - .build()); + tableComponent.addRow(ColorUtil.prependColorTag(text, Color.RED), ""); } } if (config.showDamage()) { - panelComponent.getChildren().add(LineComponent.builder() - .left("Your damage") - .right(Integer.toString(myDamage)) - .rightColor(damageForKill > 0 && myDamage >= damageForKill ? Color.GREEN : Color.RED) - .build()); - - panelComponent.getChildren().add(LineComponent.builder() - .left("Total damage") - .right(Integer.toString(totalDamage)) - .build()); + tableComponent.addRow("Your damage", ColorUtil.prependColorTag(Integer.toString(myDamage), damageForKill > 0 && myDamage >= damageForKill ? Color.GREEN : Color.RED)); + tableComponent.addRow("Total damage:", Integer.toString(totalDamage)); } + panelComponent.getChildren().add(tableComponent); return panelComponent.render(graphics); } }