From d75a50a23660b38fd3e404bf9588bb8d369aabf8 Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Sun, 28 Feb 2021 00:32:15 +0000 Subject: [PATCH] world map mouse listener: consume click if icon is clicked on This stops the map from being closed when clicking on an icon overlapping the close button. --- .../ui/overlay/worldmap/WorldMapOverlayMouseListener.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/worldmap/WorldMapOverlayMouseListener.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/worldmap/WorldMapOverlayMouseListener.java index 949c578ec2..71af9a55dc 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/worldmap/WorldMapOverlayMouseListener.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/worldmap/WorldMapOverlayMouseListener.java @@ -60,6 +60,12 @@ public class WorldMapOverlayMouseListener extends MouseAdapter if (SwingUtilities.isLeftMouseButton(e) && !worldMapPoints.isEmpty()) { Point mousePos = client.getMouseCanvasPosition(); + final Widget view = client.getWidget(WidgetInfo.WORLD_MAP_VIEW); + + if (view == null) + { + return e; + } for (WorldMapPoint worldMapPoint : worldMapPoints) { @@ -77,6 +83,7 @@ public class WorldMapOverlayMouseListener extends MouseAdapter RenderOverview renderOverview = client.getRenderOverview(); renderOverview.setWorldMapPositionTarget(target); } + e.consume(); return worldMapPoint.onClick(e); } }