From b6d5a7a9fe0f1c6a1366b60f20da083ed4b37ce4 Mon Sep 17 00:00:00 2001 From: Discreater Date: Sat, 8 May 2021 03:41:20 +0800 Subject: [PATCH] fix: now render tool tip correctly - now label's in overlay can not modify amount by mouse scroll --- .../java/me/towdium/jecalculation/gui/JecaGui.java | 4 ++-- .../towdium/jecalculation/gui/widgets/WContainer.java | 2 +- .../jecalculation/gui/widgets/WLabelScroll.java | 11 ----------- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/main/java/me/towdium/jecalculation/gui/JecaGui.java b/src/main/java/me/towdium/jecalculation/gui/JecaGui.java index b5108ea..ade0f6a 100644 --- a/src/main/java/me/towdium/jecalculation/gui/JecaGui.java +++ b/src/main/java/me/towdium/jecalculation/gui/JecaGui.java @@ -296,7 +296,7 @@ public class JecaGui extends GuiContainer { int i = 0; int separators = 0; for (String s : textLines) { - int j = this.fontRendererObj.getStringWidth(s); + int j = font.getStringWidth(s); if (j > i) i = j; //noinspection StringEquality @@ -560,7 +560,7 @@ public class JecaGui extends GuiContainer { } public void drawHoveringText(List textLines, int x, int y) { - super.drawHoveringText(textLines, x, y, fontRendererObj); + this.drawHoveringText(textLines, x, y, fontRendererObj); } } diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WContainer.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WContainer.java index 13c0827..f2e7ceb 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WContainer.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WContainer.java @@ -108,7 +108,7 @@ public class WContainer implements IContainer { @Override public WLabel getLabelUnderMouse(int xMouse, int yMouse) { if(overlay != null && overlay.mouseIn(xMouse, yMouse)) { - return overlay.getLabelUnderMouse(xMouse, yMouse); + return null; } else { return new Utilities.ReversedIterator<>(widgets).stream() .map(i -> i.getLabelUnderMouse(xMouse, yMouse)) diff --git a/src/main/java/me/towdium/jecalculation/gui/widgets/WLabelScroll.java b/src/main/java/me/towdium/jecalculation/gui/widgets/WLabelScroll.java index c534384..0baeb33 100644 --- a/src/main/java/me/towdium/jecalculation/gui/widgets/WLabelScroll.java +++ b/src/main/java/me/towdium/jecalculation/gui/widgets/WLabelScroll.java @@ -63,17 +63,6 @@ public class WLabelScroll extends WContainer implements ISearchable { scroll.setRatio(Math.min(row / (float) getAmountRows(), 1f)).setCurrent(f).setStep(step); } - // @Override - // public boolean onMouseScroll(JecaGui gui, int xMouse, int yMouse, int diff) { - // boolean in = JecaGui.mouseIn(xPos, yPos, column * 18, row * 18, xMouse, yMouse); - // if (in) { - // float pos = getPos(current - diff); - // scroll.setCurrent(pos); - // update(pos); - // } - // return in; - // } - public WLabel get(int index) { return labelGroup.get(index - column * current); }