Make ground items overlay use new Widget.contains
This commit is contained in:
@@ -28,7 +28,6 @@ import java.awt.Color;
|
|||||||
import java.awt.Dimension;
|
import java.awt.Dimension;
|
||||||
import java.awt.FontMetrics;
|
import java.awt.FontMetrics;
|
||||||
import java.awt.Graphics2D;
|
import java.awt.Graphics2D;
|
||||||
import java.awt.Rectangle;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
@@ -211,7 +210,7 @@ public class GroundItemsOverlay extends Overlay
|
|||||||
{
|
{
|
||||||
Point point = itemLayer.getCanvasLocation();
|
Point point = itemLayer.getCanvasLocation();
|
||||||
// if the item is offscreen, don't bother drawing it
|
// if the item is offscreen, don't bother drawing it
|
||||||
if (point == null || !pointInWidget(point, viewport))
|
if (point == null || (viewport != null && !viewport.contains(point)))
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -301,14 +300,4 @@ public class GroundItemsOverlay extends Overlay
|
|||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean pointInWidget(Point point, Widget widget)
|
|
||||||
{
|
|
||||||
if (widget != null)
|
|
||||||
{
|
|
||||||
Rectangle bounds = widget.getBounds();
|
|
||||||
return bounds != null && bounds.contains(new java.awt.Point(point.getX(), point.getY()));
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user