Fix the 'O' hotkey to toggle item overlay

mezz · Nov 11, 2015 · 5317fe4 · 5317fe4
1 parent b3f2901
commit 5317fe4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/main/java/mezz/jei/gui/ItemListOverlay.java b/src/main/java/mezz/jei/gui/ItemListOverlay.java
@@ -55,7 +55,8 @@ public class ItemListOverlay implements IShowsItemStacks, IClickable, IKeyable {
 	private int width;
 	private int height;
 
-	private boolean isOpen = false;
+	private boolean open = false;
+	private boolean enabled = true;
 
 	public ItemListOverlay(ItemFilter itemFilter) {
 		this.itemFilter = itemFilter;
@@ -169,7 +170,7 @@ private void backPage() {
 	}
 
 	public void drawScreen(@Nonnull Minecraft minecraft, int mouseX, int mouseY) {
-		if (!isOpen) {
+		if (!isOpen()) {
 			return;
 		}
 
@@ -202,7 +203,7 @@ public void handleTick() {
 	@Override
 	@Nullable
 	public ItemStack getStackUnderMouse(int mouseX, int mouseY) {
-		if (!isOpen) {
+		if (!isOpen()) {
 			return null;
 		}
 		for (GuiItemStack guiItemStack : guiItemStacks) {
@@ -294,19 +295,22 @@ private void setPageNum(int pageNum) {
 
 	@Override
 	public void open() {
-		isOpen = true;
+		open = true;
 		searchField.setFocused(false);
 	}
 
 	@Override
 	public void close() {
-		isOpen = false;
+		open = false;
 		searchField.setFocused(false);
 	}
 
 	@Override
 	public boolean isOpen() {
-		return isOpen;
+		return open && enabled;
 	}
 
+	public void toggleEnabled() {
+		enabled = !enabled;
+	}
 }
diff --git a/src/main/java/mezz/jei/input/InputHandler.java b/src/main/java/mezz/jei/input/InputHandler.java
@@ -192,6 +192,9 @@ private boolean handleKeyDown(int eventKey) {
 				recipesGui.showUses(itemStack);
 				return true;
 			}
+		} else if (eventKey == KeyBindings.toggleOverlay.getKeyCode()) {
+			itemListOverlay.toggleEnabled();
+			return false;
 		}
 
 		for (IKeyable keyable : keyables) {