ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

overlay renderer: bound overlays position to viewport at render time instead of at config load time

Browse Source 
Fixes overlays being reset when temporarly off screen during loading. Fixes #3571
This commit is contained in:
Adam
2018-06-11 21:27:37 -04:00
parent 2d3766ea3e
commit 4792e61997
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java
View File

@@ -220,25 +220,10 @@ public class OverlayRenderer extends MouseListener implements KeyListener
for (final Overlay overlay : overlays) for (final Overlay overlay : overlays)
{ {
final Point location = loadOverlayLocation(overlay); final Point location = loadOverlayLocation(overlay);
overlay.setPreferredLocation(location);
if (location != null
&& client.getCanvas() != null
&& !client.getCanvas().contains(location))
{
overlay.setPreferredLocation(null);
saveOverlayLocation(overlay);
}
else if (location != null)
{
overlay.setPreferredLocation(location);
}
final Dimension size = loadOverlaySize(overlay); final Dimension size = loadOverlaySize(overlay);
overlay.setPreferredSize(size);
if (size != null)
{
overlay.setPreferredSize(size);
}
final OverlayPosition position = loadOverlayPosition(overlay); final OverlayPosition position = loadOverlayPosition(overlay);
overlay.setPreferredPosition(position); overlay.setPreferredPosition(position);
@@ -379,9 +364,14 @@ public class OverlayRenderer extends MouseListener implements KeyListener
} }
else else
{ {
if (overlay.getPreferredLocation() != null) final Point preferredLocation = overlay.getPreferredLocation();
if (preferredLocation != null)
{ {
location.setLocation(overlay.getPreferredLocation()); final Dimension realDimensions = client.getRealDimensions();
final int x = Math.min(realDimensions.width - 5, preferredLocation.x);
final int y = Math.min(realDimensions.height - 5, preferredLocation.y);
location.setLocation(x, y);
} }
} }