From ea051beb4e6e83a2122981677978994f32499cba Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Fri, 15 Jun 2018 10:14:57 +0200 Subject: [PATCH] Reduce code duplicity in resetOverlay method Use saveOverlay and null all fields to achieve same result. Signed-off-by: Tomas Slusny --- .../runelite/client/ui/overlay/OverlayManager.java | 11 ++++------- .../runelite/client/ui/overlay/OverlayRenderer.java | 3 --- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java index d9f96daed4..1ee29f6e41 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java @@ -191,13 +191,10 @@ public class OverlayManager */ public synchronized void resetOverlay(final Overlay overlay) { - final String locationKey = overlay.getName() + OVERLAY_CONFIG_PREFERRED_LOCATION; - final String positionKey = overlay.getName() + OVERLAY_CONFIG_PREFERRED_POSITION; - final String sizeKey = overlay.getName() + OVERLAY_CONFIG_PREFERRED_SIZE; - configManager.unsetConfiguration(RUNELITE_CONFIG_GROUP_NAME, locationKey); - configManager.unsetConfiguration(RUNELITE_CONFIG_GROUP_NAME, positionKey); - configManager.unsetConfiguration(RUNELITE_CONFIG_GROUP_NAME, sizeKey); - rebuildOverlayLayers(); + overlay.setPreferredPosition(null); + overlay.setPreferredSize(null); + overlay.setPreferredLocation(null); + saveOverlay(overlay); } private synchronized void rebuildOverlayLayers() diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java index 6463b61119..2b623b92d4 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java @@ -256,9 +256,6 @@ public class OverlayRenderer extends MouseListener implements KeyListener // detached overlays have no place to reset back to if (overlay.getPosition() != OverlayPosition.DETACHED) { - overlay.setPreferredPosition(null); - overlay.setPreferredSize(null); - overlay.setPreferredLocation(null); overlayManager.resetOverlay(overlay); } }