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

Migrate XpGlobesOverlay tooltips to component tooltips

Browse Source 
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
Co-Authored-By: Jordan <Nightfirecat@users.noreply.github.com>
This commit is contained in:
Tomas Slusny
2020-03-08 22:31:25 +01:00
parent ba30018b1b
commit 6234213505
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java
View File

@@ -53,6 +53,8 @@ import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayUtil; import net.runelite.client.ui.overlay.OverlayUtil;
import net.runelite.client.ui.overlay.components.LineComponent; import net.runelite.client.ui.overlay.components.LineComponent;
import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.PanelComponent;
import net.runelite.client.ui.overlay.tooltip.Tooltip;
import net.runelite.client.ui.overlay.tooltip.TooltipManager;
public class XpGlobesOverlay extends Overlay public class XpGlobesOverlay extends Overlay
{ {
@@ -66,8 +68,9 @@ public class XpGlobesOverlay extends Overlay
private final XpGlobesPlugin plugin; private final XpGlobesPlugin plugin;
private final XpGlobesConfig config; private final XpGlobesConfig config;
private final XpTrackerService xpTrackerService; private final XpTrackerService xpTrackerService;
private final PanelComponent xpTooltip = new PanelComponent(); private final TooltipManager tooltipManager;
private final SkillIconManager iconManager; private final SkillIconManager iconManager;
private final Tooltip xpTooltip = new Tooltip(new PanelComponent());
@Inject @Inject
private XpGlobesOverlay( private XpGlobesOverlay(
@@ -75,7 +78,8 @@ public class XpGlobesOverlay extends Overlay
XpGlobesPlugin plugin, XpGlobesPlugin plugin,
XpGlobesConfig config, XpGlobesConfig config,
XpTrackerService xpTrackerService, XpTrackerService xpTrackerService,
SkillIconManager iconManager) SkillIconManager iconManager,
TooltipManager tooltipManager)
{ {
super(plugin); super(plugin);
this.iconManager = iconManager; this.iconManager = iconManager;
@@ -83,6 +87,8 @@ public class XpGlobesOverlay extends Overlay
this.plugin = plugin; this.plugin = plugin;
this.config = config; this.config = config;
this.xpTrackerService = xpTrackerService; this.xpTrackerService = xpTrackerService;
this.tooltipManager = tooltipManager;
this.xpTooltip.getComponent().setPreferredSize(new Dimension(TOOLTIP_RECT_SIZE_X, 0));
setPosition(OverlayPosition.TOP_CENTER); setPosition(OverlayPosition.TOP_CENTER);
getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "XP Globes overlay")); getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "XP Globes overlay"));
} }
@@ -150,7 +156,7 @@ public class XpGlobesOverlay extends Overlay
if (config.enableTooltips()) if (config.enableTooltips())
{ {
drawTooltip(graphics, skillToDraw, goalXp, backgroundCircle); drawTooltip(skillToDraw, goalXp);
} }
} }
@@ -229,12 +235,8 @@ public class XpGlobesOverlay extends Overlay
); );
} }
private void drawTooltip(Graphics2D graphics, XpGlobe mouseOverSkill, int goalXp, Ellipse2D drawnGlobe) private void drawTooltip(XpGlobe mouseOverSkill, int goalXp)
{ {
//draw tooltip under the globe of the mouse location
int x = (int) drawnGlobe.getX() - (TOOLTIP_RECT_SIZE_X / 2) + (config.xpOrbSize() / 2);
int y = (int) drawnGlobe.getY() + config.xpOrbSize() + 10;
// reset the timer on XpGlobe to prevent it from disappearing while hovered over it // reset the timer on XpGlobe to prevent it from disappearing while hovered over it
mouseOverSkill.setTime(Instant.now()); mouseOverSkill.setTime(Instant.now());
@@ -244,9 +246,8 @@ public class XpGlobesOverlay extends Overlay
DecimalFormat decimalFormat = new DecimalFormat("###,###,###"); DecimalFormat decimalFormat = new DecimalFormat("###,###,###");
String skillCurrentXp = decimalFormat.format(mouseOverSkill.getCurrentXp()); String skillCurrentXp = decimalFormat.format(mouseOverSkill.getCurrentXp());
final PanelComponent xpTooltip = (PanelComponent) this.xpTooltip.getComponent();
xpTooltip.getChildren().clear(); xpTooltip.getChildren().clear();
xpTooltip.setPreferredLocation(new java.awt.Point(x, y));
xpTooltip.setPreferredSize(new Dimension(TOOLTIP_RECT_SIZE_X, 0));
xpTooltip.getChildren().add(LineComponent.builder() xpTooltip.getChildren().add(LineComponent.builder()
.left(skillName) .left(skillName)
@@ -303,6 +304,6 @@ public class XpGlobesOverlay extends Overlay
} }
} }
xpTooltip.render(graphics); tooltipManager.add(this.xpTooltip);
} }
} }

1
runelite-client/src/main/java/net/runelite/client/ui/overlay/components/TooltipComponent.java
View File

@@ -240,6 +240,5 @@ public class TooltipComponent implements LayoutableRenderableEntity
@Override @Override
public void setPreferredSize(Dimension dimension) public void setPreferredSize(Dimension dimension)
{ {
} }
} }