diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightConfig.java index 9b9d19b750..b3ad77aa9e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightConfig.java @@ -33,6 +33,17 @@ public interface MouseHighlightConfig extends Config { @ConfigItem( position = 0, + keyName = "mainTooltip", + name = "Main Tooltips", + description = "Whether or not tooltips are shown on things other than interfaces or the chatbox" + ) + default boolean mainTooltip() + { + return true; + } + + @ConfigItem( + position = 1, keyName = "uiTooltip", name = "Interface Tooltips", description = "Whether or not tooltips are shown on interfaces" @@ -43,7 +54,7 @@ public interface MouseHighlightConfig extends Config } @ConfigItem( - position = 1, + position = 2, keyName = "chatboxTooltip", name = "Chatbox Tooltips", description = "Whether or not tooltips are shown over the chatbox" @@ -53,13 +64,23 @@ public interface MouseHighlightConfig extends Config return true; } - @ConfigItem(position = 2, keyName = "hideSpells", name = "Spellbook", description = "Hides vanilla client tooltips in the spellbook") + @ConfigItem( + position = 3, + keyName = "hideSpells", + name = "Spellbook", + description = "Hides vanilla client tooltips in the spellbook" + ) default boolean shouldHideSpells() { return false; } - @ConfigItem(position = 3, keyName = "hideCombat", name = "Combat", description = "Hides vanilla client tooltips in the combat menu") + @ConfigItem( + position = 4, + keyName = "hideCombat", + name = "Combat", + description = "Hides vanilla client tooltips in the combat menu" + ) default boolean shouldHideCombat() { return false; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java index e7e12580cd..0a9e9901c1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java @@ -126,6 +126,11 @@ class MouseHighlightOverlay extends Overlay } } + if (widget == null && !config.mainTooltip()) + { + return null; + } + // If this varc is set, a tooltip is already being displayed int tooltipDisplayed = client.getVar(VarClientInt.TOOLTIP_VISIBLE); if (tooltipDisplayed == 1)