Merge pull request #7708 from deathbeam/fix-overflow
Prevent negative values when overlay is bigger than screen
This commit is contained in:
@@ -250,8 +250,8 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
|
|||||||
}
|
}
|
||||||
|
|
||||||
final Dimension realDimensions = client.getRealDimensions();
|
final Dimension realDimensions = client.getRealDimensions();
|
||||||
location.x = Ints.constrainToRange(location.x, 0, realDimensions.width - dimension.width);
|
location.x = Ints.constrainToRange(location.x, 0, Math.max(0, realDimensions.width - dimension.width));
|
||||||
location.y = Ints.constrainToRange(location.y, 0, realDimensions.height - dimension.height);
|
location.y = Ints.constrainToRange(location.y, 0, Math.max(0, realDimensions.height - dimension.height));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (overlay.getPreferredSize() != null)
|
if (overlay.getPreferredSize() != null)
|
||||||
@@ -347,8 +347,8 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
|
|||||||
{
|
{
|
||||||
final Dimension realDimension = client.getRealDimensions();
|
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.x = Ints.constrainToRange(mousePoint.x, 0, Math.max(0, realDimension.width - movedOverlay.getBounds().width));
|
||||||
mousePoint.y = Ints.constrainToRange(mousePoint.y, 0, realDimension.height - movedOverlay.getBounds().height);
|
mousePoint.y = Ints.constrainToRange(mousePoint.y, 0, Math.max(0, realDimension.height - movedOverlay.getBounds().height));
|
||||||
movedOverlay.setPreferredPosition(null);
|
movedOverlay.setPreferredPosition(null);
|
||||||
movedOverlay.setPreferredLocation(mousePoint);
|
movedOverlay.setPreferredLocation(mousePoint);
|
||||||
mouseEvent.consume();
|
mouseEvent.consume();
|
||||||
|
|||||||
Reference in New Issue
Block a user