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

Merge pull request #6442 from deathbeam/prevent-offscreen

Browse Source 
Prevent overlays from moving off-screen
This commit is contained in:
Tomas Slusny
2018-11-12 13:03:58 +01:00
committed by GitHub
parent 4244802476 0d00f2764a
commit bd3518f2f9
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@ package net.runelite.client.ui.overlay;
import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects;
import com.google.common.eventbus.Subscribe; import com.google.common.eventbus.Subscribe;
import com.google.common.primitives.Ints;
import java.awt.Color; import java.awt.Color;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.Graphics2D; import java.awt.Graphics2D;
@@ -191,13 +192,14 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
if (preferredLocation != null) if (preferredLocation != null)
{ {
final Dimension realDimensions = client.getRealDimensions(); location.setLocation(preferredLocation);
final int x = Math.min(realDimensions.width - 5, preferredLocation.x);
final int y = Math.min(realDimensions.height - 5, preferredLocation.y);
location.setLocation(x, y);
} }
} }
final Dimension realDimensions = client.getRealDimensions();
location.x = Ints.constrainToRange(location.x, 0, realDimensions.width - dimension.width);
location.y = Ints.constrainToRange(location.y, 0, realDimensions.height - dimension.height);
if (overlay.getPreferredSize() != null) if (overlay.getPreferredSize() != null)
{ {
overlay.getBounds().setSize(overlay.getPreferredSize()); overlay.getBounds().setSize(overlay.getPreferredSize());
@@ -284,7 +286,10 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
if (movedOverlay != null) if (movedOverlay != null)
{ {
final Dimension realDimension = client.getRealDimensions();
mousePoint.translate(-overlayOffset.x, -overlayOffset.y); mousePoint.translate(-overlayOffset.x, -overlayOffset.y);
mousePoint.x = Ints.constrainToRange(mousePoint.x, 0, realDimension.width - movedOverlay.getBounds().width);
mousePoint.y = Ints.constrainToRange(mousePoint.y, 0, realDimension.height - movedOverlay.getBounds().height);
movedOverlay.setPreferredPosition(null); movedOverlay.setPreferredPosition(null);
movedOverlay.setPreferredLocation(mousePoint); movedOverlay.setPreferredLocation(mousePoint);
mouseEvent.consume(); mouseEvent.consume();