From 972cca410bd3342741678659f7a10e86d2054432 Mon Sep 17 00:00:00 2001 From: SoyChai Date: Mon, 9 Apr 2018 11:48:43 +1000 Subject: [PATCH] attackstyles: Add a toggle to Always show style --- .../attackstyles/AttackStylesConfig.java | 11 ++++++++++ .../attackstyles/AttackStylesOverlay.java | 21 +++++++++++++------ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesConfig.java index faa1b9ac6f..ca0c6b5282 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesConfig.java @@ -35,6 +35,17 @@ import net.runelite.client.config.ConfigItem; ) public interface AttackStylesConfig extends Config { + @ConfigItem( + keyName = "alwaysShowStyle", + name = "Always show style", + description = "Show attack style indicator at all times", + position = 1 + ) + default boolean alwaysShowStyle() + { + return true; + } + @ConfigItem( keyName = "warnForDefensive", name = "Warn for defensive", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesOverlay.java index d75c7927fc..f576ca9744 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesOverlay.java @@ -37,24 +37,33 @@ public class AttackStylesOverlay extends Overlay private static final int COMPONENT_WIDTH = 80; private final AttackStylesPlugin plugin; + private final AttackStylesConfig config; private final PanelComponent panelComponent = new PanelComponent(); @Inject - public AttackStylesOverlay(AttackStylesPlugin plugin) + public AttackStylesOverlay(AttackStylesPlugin plugin, AttackStylesConfig config) { setPosition(OverlayPosition.ABOVE_CHATBOX_RIGHT); this.plugin = plugin; + this.config = config; } @Override public Dimension render(Graphics2D graphics) { - final String attackStyleString = plugin.getAttackStyle().getName(); + boolean warnedSkillSelected = plugin.isWarnedSkillSelected(); - panelComponent.setTitleColor(plugin.isWarnedSkillSelected() ? Color.RED : Color.WHITE); - panelComponent.setTitle(attackStyleString); - panelComponent.setWidth(COMPONENT_WIDTH); + if (warnedSkillSelected || config.alwaysShowStyle()) + { + final String attackStyleString = plugin.getAttackStyle().getName(); - return panelComponent.render(graphics); + panelComponent.setTitleColor(warnedSkillSelected ? Color.RED : Color.WHITE); + panelComponent.setTitle(attackStyleString); + panelComponent.setWidth(COMPONENT_WIDTH); + + return panelComponent.render(graphics); + } + + return null; } }