boosts overlay: move next change text to display at the top

This commit is contained in:
Seth
2018-04-23 14:31:29 -05:00
parent 4118fa9f50
commit 7bbd0b3de7

View File

@@ -57,6 +57,8 @@ class BoostsOverlay extends Overlay
private PanelComponent panelComponent; private PanelComponent panelComponent;
private boolean overlayActive;
@Inject @Inject
BoostsOverlay(Client client, BoostsConfig config, InfoBoxManager infoBoxManager) BoostsOverlay(Client client, BoostsConfig config, InfoBoxManager infoBoxManager)
{ {
@@ -71,7 +73,23 @@ class BoostsOverlay extends Overlay
public Dimension render(Graphics2D graphics) public Dimension render(Graphics2D graphics)
{ {
panelComponent = new PanelComponent(); panelComponent = new PanelComponent();
boolean overlayActive = false;
Instant lastChange = plugin.getLastChange();
if (config.displayNextChange() && lastChange != null && overlayActive)
{
int nextChange = 60 - (int)Duration.between(lastChange, Instant.now()).getSeconds();
if (nextChange > 0)
{
panelComponent.getLines().add(new PanelComponent.Line(
"Next change in",
Color.WHITE,
String.valueOf(nextChange),
Color.WHITE
));
}
}
overlayActive = false;
for (Skill skill : plugin.getShownSkills()) for (Skill skill : plugin.getShownSkills())
{ {
@@ -137,21 +155,6 @@ class BoostsOverlay extends Overlay
} }
} }
Instant lastChange = plugin.getLastChange();
if (config.displayNextChange() && lastChange != null && overlayActive)
{
int nextChange = 60 - (int)Duration.between(lastChange, Instant.now()).getSeconds();
if (nextChange > 0)
{
panelComponent.getLines().add(new PanelComponent.Line(
"Next change in",
Color.WHITE,
String.valueOf(nextChange),
Color.WHITE
));
}
}
return panelComponent.getLines().isEmpty() ? null : panelComponent.render(graphics); return panelComponent.getLines().isEmpty() ? null : panelComponent.render(graphics);
} }