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

Merge pull request #358 from deathbeam/tooltip-overlap

Browse Source 
Let overlapping tooltips stack vertically
This commit is contained in:
Adam
2018-01-11 20:35:51 -05:00
committed by GitHub
parent a665120b3e f26cf7ac00
commit bf028d8d0c
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
runelite-client/src/main/java/net/runelite/client/ui/overlay/tooltip/TooltipOverlay.java
View File

@@ -27,6 +27,7 @@ package net.runelite.client.ui.overlay.tooltip;
import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.Point;
import java.awt.Rectangle;
import java.util.List;
import javax.inject.Inject;
import javax.inject.Provider;
@@ -38,6 +39,7 @@ import net.runelite.client.ui.overlay.components.TooltipComponent;
public class TooltipOverlay extends Overlay
{
private static final int PADDING = 2;
private final TooltipManager tooltipManager;
private final Provider<Client> clientProvider;
@@ -60,25 +62,37 @@ public class TooltipOverlay extends Overlay
return null;
}
final Rectangle lastLocation = new Rectangle();
for (Tooltip tooltip : tooltips)
{
final TooltipComponent tooltipComponent = new TooltipComponent();
tooltipComponent.setText(tooltip.getText());
final Point position = new Point();
if (tooltip.isFollowMouse())
{
final Client client = clientProvider.get();
final net.runelite.api.Point mouseCanvasPosition = client != null
? client.getMouseCanvasPosition()
: new net.runelite.api.Point(0, 0);
tooltipComponent.setPosition(new Point(mouseCanvasPosition.getX(), mouseCanvasPosition.getY()));
position.setLocation(mouseCanvasPosition.getX(), mouseCanvasPosition.getY());
}
else
{
tooltipComponent.setPosition(tooltip.getPosition());
position.setLocation(tooltip.getPosition());
}
tooltipComponent.render(graphics, parent);
if (lastLocation.contains(position))
{
position.translate(0, -lastLocation.height - PADDING);
}
tooltipComponent.setPosition(position);
lastLocation.setLocation(position);
lastLocation.setSize(tooltipComponent.render(graphics, parent));
}
tooltipManager.clear();