From 5822e489f713d15f3a826801d34d82440f4a177f Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 27 Dec 2020 19:16:48 -0500 Subject: [PATCH] Allow mouse tooltips on the welcome screen and full screen world map Adjust the mouse highlight overlay to run at the same layers as the tooltip overlay. It always runs first due to having a lower position. I think previously tooltips from ui ops were 1 frame behind due to this being UNDER_WIDGETS. Additionally change the tooltip overlay to draw after the fullscreen tli instead of the world map interface. Having it render after the world map caused tooltips to render after the floating world map too, which is too early. The fullscreen tli is the root of both the fullscreen world map and of the welcome screen. --- .../src/main/java/net/runelite/api/widgets/WidgetID.java | 2 +- .../src/main/java/net/runelite/api/widgets/WidgetInfo.java | 2 -- .../client/plugins/devtools/WidgetInspectorOverlay.java | 2 +- .../client/plugins/mousehighlight/MouseHighlightOverlay.java | 4 ++++ .../runelite/client/ui/overlay/tooltip/TooltipOverlay.java | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java index c2a61de5e4..cf5597004c 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -131,7 +131,7 @@ public class WidgetID public static final int LOOTING_BAG_GROUP_ID = 81; public static final int SKOTIZO_GROUP_ID = 308; public static final int ENTERING_HOUSE_GROUP_ID = 71; - public static final int FULLSCREEN_MAP_GROUP_ID = 165; + public static final int FULLSCREEN_CONTAINER_TLI = 165; public static final int QUESTLIST_GROUP_ID = 399; public static final int SKILLS_GROUP_ID = 320; public static final int MUSIC_GROUP_ID = 239; diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java index 50bc1d2171..486bd504e1 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java @@ -518,8 +518,6 @@ public enum WidgetInfo SKOTIZO_CONTAINER(WidgetID.SKOTIZO_GROUP_ID, WidgetID.Skotizo.CONTAINER), - FULLSCREEN_MAP_ROOT(WidgetID.FULLSCREEN_MAP_GROUP_ID, WidgetID.FullScreenMap.ROOT), - QUESTLIST_BOX(WidgetID.QUESTLIST_GROUP_ID, WidgetID.QuestList.BOX), QUESTLIST_CONTAINER(WidgetID.QUESTLIST_GROUP_ID, WidgetID.QuestList.CONTAINER), QUESTLIST_SCROLLBAR(WidgetID.QUESTLIST_GROUP_ID, WidgetID.QuestList.SCROLLBAR), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspectorOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspectorOverlay.java index 27b83f0f2a..bd89bd90c5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspectorOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspectorOverlay.java @@ -62,7 +62,7 @@ public class WidgetInspectorOverlay extends Overlay setPosition(OverlayPosition.DYNAMIC); setLayer(OverlayLayer.ABOVE_WIDGETS); setPriority(OverlayPriority.HIGHEST); - drawAfterInterface(WidgetID.FULLSCREEN_MAP_GROUP_ID); + drawAfterInterface(WidgetID.FULLSCREEN_CONTAINER_TLI); } @Override 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 be6001241d..1e56b743eb 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 @@ -37,6 +37,7 @@ import net.runelite.api.VarClientInt; import net.runelite.api.widgets.WidgetID; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.ui.overlay.Overlay; +import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.tooltip.Tooltip; import net.runelite.client.ui.overlay.tooltip.TooltipManager; @@ -80,6 +81,9 @@ class MouseHighlightOverlay extends Overlay MouseHighlightOverlay(Client client, TooltipManager tooltipManager, MouseHighlightConfig config) { setPosition(OverlayPosition.DYNAMIC); + setLayer(OverlayLayer.ABOVE_WIDGETS); + // additionally allow tooltips above the full screen world map and welcome screen + drawAfterInterface(WidgetID.FULLSCREEN_CONTAINER_TLI); this.client = client; this.tooltipManager = tooltipManager; this.config = config; diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/tooltip/TooltipOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/tooltip/TooltipOverlay.java index 002af12c34..81a1142e08 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/tooltip/TooltipOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/tooltip/TooltipOverlay.java @@ -61,8 +61,8 @@ public class TooltipOverlay extends Overlay setPosition(OverlayPosition.TOOLTIP); setPriority(OverlayPriority.HIGHEST); setLayer(OverlayLayer.ABOVE_WIDGETS); - // additionally allow tooltips above the world map - drawAfterInterface(WidgetID.WORLD_MAP_GROUP_ID); + // additionally allow tooltips above the full screen world map and welcome screen + drawAfterInterface(WidgetID.FULLSCREEN_CONTAINER_TLI); } @Override