From ef588c0ace2c668f61deb5b14b3299fd243f2ff6 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 1 Jul 2019 20:06:43 +0800 Subject: Refractor HighlightableWidget --- src/main/java/me/shedaniel/rei/gui/widget/ClickableLabelWidget.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/gui/widget/ClickableLabelWidget.java') diff --git a/src/main/java/me/shedaniel/rei/gui/widget/ClickableLabelWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/ClickableLabelWidget.java index c2e5087a6..3b6417da1 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/ClickableLabelWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/ClickableLabelWidget.java @@ -32,7 +32,7 @@ public abstract class ClickableLabelWidget extends LabelWidget { colour = getHoveredColor(); drawCenteredString(font, (isHovered(mouseX, mouseY) ? Formatting.UNDERLINE.toString() : "") + text, x, y, colour); if (clickable && getTooltips().isPresent()) - if (!focused && isHighlighted(mouseX, mouseY)) + if (!focused && containsMouse(mouseX, mouseY)) ScreenHelper.getLastOverlay().addTooltip(QueuedTooltip.create(getTooltips().get().split("\n"))); else if (focused) ScreenHelper.getLastOverlay().addTooltip(QueuedTooltip.create(new Point(x, y), getTooltips().get().split("\n"))); @@ -48,7 +48,7 @@ public abstract class ClickableLabelWidget extends LabelWidget { @Override public boolean mouseClicked(double mouseX, double mouseY, int button) { - if (button == 0 && clickable && isHighlighted(mouseX, mouseY)) { + if (button == 0 && clickable && containsMouse(mouseX, mouseY)) { onLabelClicked(); return true; } @@ -78,7 +78,7 @@ public abstract class ClickableLabelWidget extends LabelWidget { } public boolean isHovered(int mouseX, int mouseY) { - return clickable && (isHighlighted(mouseX, mouseY) || focused); + return clickable && (containsMouse(mouseX, mouseY) || focused); } public abstract void onLabelClicked(); -- cgit