Fixed ItemZoom incompatibility in Grid. Fixes #1844

This commit is contained in:
raoulvdberge
2018-07-15 18:22:59 +02:00
parent bc5fb1f58b
commit e766e8a7c8
2 changed files with 13 additions and 5 deletions

View File

@@ -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 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 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 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) - Prevent accidental Grid scrollbar click after clicking JEI recipe transfer button (raoulvdberge)
- Added a missing config option for Crafter Manager energy usage (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) - Added support for Disk Drive / Storage Block storage and capacity to OC integration (zangai)

View File

@@ -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(); 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 @Override
public void drawForeground(int mouseX, int mouseY) { public void drawForeground(int mouseX, int mouseY) {
drawString(7, 7 + tabs.getHeight(), t(grid.getGuiTitle())); 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)) { if (isOverClear(mouseX, mouseY)) {
drawTooltip(mouseX, mouseY, t("misc.refinedstorage:clear")); drawTooltip(mouseX, mouseY, t("misc.refinedstorage:clear"));
} }