From d16ef229ebf8ff3fedcf6af719c08d0948a76c5c Mon Sep 17 00:00:00 2001 From: Ganom Date: Fri, 21 Jun 2019 19:19:06 -0400 Subject: [PATCH] Update Scouter to include background options, and fix record raid bug. --- .../client/plugins/raids/RaidsConfig.java | 12 ++++++ .../client/plugins/raids/RaidsOverlay.java | 38 ++++++++++++++----- 2 files changed, 41 insertions(+), 9 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsConfig.java index c1c55c5111..dec84b0a5f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsConfig.java @@ -59,6 +59,18 @@ public interface RaidsConfig extends Config return true; } + @ConfigItem( + position = 2, + parent = "scouterConfig", + keyName = "hideBackground", + name = "Hide Scouter Background", + description = "Removes the scouter background, and makes it transparent." + ) + default boolean hideBackground() + { + return true; + } + @ConfigItem( position = 2, parent = "scouterConfig", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java index b65e380c1b..3c15b0b678 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java @@ -52,6 +52,7 @@ import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE; 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.ComponentOrientation; import net.runelite.client.ui.overlay.components.ImageComponent; import net.runelite.client.ui.overlay.components.PanelComponent; @@ -154,6 +155,15 @@ public class RaidsOverlay extends Overlay scouterActive = false; panelComponent.getChildren().clear(); + if (config.hideBackground()) + { + panelComponent.setBackgroundColor(null); + } + else + { + panelComponent.setBackgroundColor(ComponentConstants.STANDARD_BACKGROUND_COLOR); + } + if (plugin.getRaid() == null || plugin.getRaid().getLayout() == null) { panelComponent.getChildren().add(TitleComponent.builder() @@ -279,14 +289,13 @@ public class RaidsOverlay extends Overlay scavsBeforeIceRooms.add(prev); } int lastScavs = scavRooms.get(scavRooms.size() - 1); - if (!recordRaid()) - { - panelComponent.getChildren().add(TitleComponent.builder() - .text(displayLayout) - .color(color) - .build()); - } - else + + panelComponent.getChildren().add(TitleComponent.builder() + .text(displayLayout) + .color(color) + .build()); + + if (recordRaid()) { panelComponent.getChildren().add(TitleComponent.builder() .text("Record Raid") @@ -294,6 +303,17 @@ public class RaidsOverlay extends Overlay .build()); panelComponent.setBackgroundColor(new Color(0, 255, 0, 10)); } + else + { + if (config.hideBackground()) + { + panelComponent.setBackgroundColor(null); + } + else + { + panelComponent.setBackgroundColor(ComponentConstants.STANDARD_BACKGROUND_COLOR); + } + } TableComponent tableComponent = new TableComponent(); tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT); @@ -304,7 +324,7 @@ public class RaidsOverlay extends Overlay String clanOwner = Text.removeTags(client.getWidget(WidgetInfo.CLAN_CHAT_OWNER).getText()); if (clanOwner.equals("None")) { - clanOwner = "Open CC tab..."; + clanOwner = "Open CC Tab"; color = Color.RED; }