diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b26e8548..4e93e1e06 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,6 +40,7 @@ NOTE: Worlds that used Refined Storage 1.5.x are fully compatible with Refined S - Fixed bug where External Storage doesn't detect new inventory when rotating (raoulvdberge) - Fixed JEI recipe transferring in Pattern Grid allowing non-processing recipes in processing mode and vice-versa (raoulvdberge) - Fixed using Interfaces for minimum stock levels failing when requester is also an Interface (raoulvdberge) +- Fixed ItemZoom incompatibility in Grid (raoulvdberge) - Prevent accidental Grid scrollbar click after clicking JEI recipe transfer button (raoulvdberge) - Added a missing config option for Crafter Manager energy usage (raoulvdberge) - Added support for Disk Drive / Storage Block storage and capacity to OC integration (zangai) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java index f6d7b46ab..2a004c47c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java @@ -218,7 +218,7 @@ public class GuiGrid extends GuiBase implements IResizableDisplay { } } - public boolean isOverSlotWithStack() { + private boolean isOverSlotWithStack() { return grid.isActive() && isOverSlot() && slotNumber < view.getStacks().size(); } @@ -310,6 +310,17 @@ public class GuiGrid extends GuiBase implements IResizableDisplay { } } + @Override + public void drawScreen(int mouseX, int mouseY, float partialTicks) { + super.drawScreen(mouseX, mouseY, partialTicks); + + // Drawn in here for bug #1844 (https://github.com/raoulvdberge/refinedstorage/issues/1844) + // Item tooltips can't be rendered in the foreground layer due to the X offset translation. + if (isOverSlotWithStack()) { + drawGridTooltip(view.getStacks().get(slotNumber), mouseX, mouseY); + } + } + @Override public void drawForeground(int mouseX, int mouseY) { drawString(7, 7 + tabs.getHeight(), t(grid.getGuiTitle())); @@ -357,10 +368,6 @@ public class GuiGrid extends GuiBase implements IResizableDisplay { } } - if (isOverSlotWithStack()) { - drawGridTooltip(view.getStacks().get(slotNumber), mouseX, mouseY); - } - if (isOverClear(mouseX, mouseY)) { drawTooltip(mouseX, mouseY, t("misc.refinedstorage:clear")); }