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

Fix Combat Counter Tables (#663)

Browse Source 
* Fix Alignments

* Fix Alignment
This commit is contained in:
Ganom
2019-06-19 19:25:11 -04:00
committed by James
parent 6b5863d363
commit 2a0bf66e3b
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java
View File

@@ -38,6 +38,7 @@ import net.runelite.client.ui.overlay.OverlayMenuEntry;
import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.PanelComponent;
import net.runelite.client.ui.overlay.components.TitleComponent; import net.runelite.client.ui.overlay.components.TitleComponent;
import net.runelite.client.ui.overlay.components.table.TableAlignment;
import net.runelite.client.ui.overlay.components.table.TableComponent; import net.runelite.client.ui.overlay.components.table.TableComponent;
import net.runelite.client.util.ColorUtil; import net.runelite.client.util.ColorUtil;
@@ -66,8 +67,6 @@ class CombatOverlay extends Overlay
getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Tick Counter")); getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Tick Counter"));
} }
@Override @Override
public Dimension render(Graphics2D graphics) public Dimension render(Graphics2D graphics)
{ {
@@ -77,12 +76,15 @@ class CombatOverlay extends Overlay
Player local = client.getLocalPlayer(); Player local = client.getLocalPlayer();
if (local == null || local.getName() == null) if (local == null || local.getName() == null)
{
return null; return null;
}
panelComponent.setBackgroundColor(config.bgColor()); panelComponent.setBackgroundColor(config.bgColor());
panelComponent.getChildren().add(TitleComponent.builder().text("Tick Counter").color(config.titleColor()).build()); panelComponent.getChildren().add(TitleComponent.builder().text("Tick Counter").color(config.titleColor()).build());
int total = 0; int total = 0;
TableComponent tableComponent = new TableComponent(); TableComponent tableComponent = new TableComponent();
tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT);
if (plugin.getCounter().isEmpty()) if (plugin.getCounter().isEmpty())
{ {
@@ -92,7 +94,9 @@ class CombatOverlay extends Overlay
{ {
Map<String, Long> map = this.plugin.getCounter(); Map<String, Long> map = this.plugin.getCounter();
if (map == null) if (map == null)
{
return null; return null;
}
for (String name : map.keySet()) for (String name : map.keySet())
{ {

6
runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java
View File

@@ -37,6 +37,7 @@ import net.runelite.client.ui.overlay.OverlayMenuEntry;
import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.PanelComponent;
import net.runelite.client.ui.overlay.components.TitleComponent; import net.runelite.client.ui.overlay.components.TitleComponent;
import net.runelite.client.ui.overlay.components.table.TableAlignment;
import net.runelite.client.ui.overlay.components.table.TableComponent; import net.runelite.client.ui.overlay.components.table.TableComponent;
import net.runelite.client.util.ColorUtil; import net.runelite.client.util.ColorUtil;
@@ -76,11 +77,14 @@ class DamageOverlay extends Overlay
Player local = client.getLocalPlayer(); Player local = client.getLocalPlayer();
if (local == null || local.getName() == null) if (local == null || local.getName() == null)
{
return null; return null;
}
panelComponent.setBackgroundColor(config.bgColor()); panelComponent.setBackgroundColor(config.bgColor());
panelComponent.getChildren().add(TitleComponent.builder().text("Damage Counter").color(config.titleColor()).build()); panelComponent.getChildren().add(TitleComponent.builder().text("Damage Counter").color(config.titleColor()).build());
TableComponent tableComponent = new TableComponent(); TableComponent tableComponent = new TableComponent();
tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT);
if (plugin.getCounter().isEmpty()) if (plugin.getCounter().isEmpty())
{ {
@@ -90,7 +94,9 @@ class DamageOverlay extends Overlay
{ {
Map<String, Double> map = this.plugin.playerDamage; Map<String, Double> map = this.plugin.playerDamage;
if (map == null) if (map == null)
{
return null; return null;
}
for (String name : map.keySet()) for (String name : map.keySet())
{ {