From aec99b378da9b115edd407263ee4cda0d25be05b Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Tue, 16 Oct 2018 19:58:26 +0200
Subject: [PATCH] Fixed tooltips always being visible when a crafting monitor
 is disabled and there are task(s) running.

---
 .../gui/GuiCraftingMonitor.java               |  4 +---
 .../refinedstorage/gui/control/TabList.java   | 20 ++++++++++---------
 .../refinedstorage/gui/grid/GuiGrid.java      |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java
index 7cdfea5f4..2302d24dd 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java
@@ -255,9 +255,7 @@ public class GuiCraftingMonitor extends GuiBase {
 
         drawTexture(x, y, 0, 0, screenWidth, screenHeight);
 
-        if (craftingMonitor.isActive()) {
-            tabs.drawForeground(x, y - tabs.getHeight(), mouseX, mouseY);
-        }
+        tabs.drawForeground(x, y - tabs.getHeight(), mouseX, mouseY, craftingMonitor.isActive());
     }
 
     @Override
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/control/TabList.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/TabList.java
index 4d0f53657..7f3a26045 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/control/TabList.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/control/TabList.java
@@ -55,19 +55,21 @@ public class TabList {
         listeners.add(listener);
     }
 
-    public void drawForeground(int x, int y, int mouseX, int mouseY) {
+    public void drawForeground(int x, int y, int mouseX, int mouseY, boolean visible) {
         this.tabHovering = -1;
 
-        int j = 0;
-        for (int i = page.get() * tabsPerPage; i < (page.get() * tabsPerPage) + tabsPerPage; ++i) {
-            if (i < tabs.get().size()) {
-                drawTab(tabs.get().get(i), true, x, y, i, j);
+        if (visible) {
+            int j = 0;
+            for (int i = page.get() * tabsPerPage; i < (page.get() * tabsPerPage) + tabsPerPage; ++i) {
+                if (i < tabs.get().size()) {
+                    drawTab(tabs.get().get(i), true, x, y, i, j);
 
-                if (gui.inBounds(x + getXOffset() + ((IGridTab.TAB_WIDTH + 1) * j), y, IGridTab.TAB_WIDTH, IGridTab.TAB_HEIGHT - (i == selected.get() ? 2 : 7), mouseX, mouseY)) {
-                    this.tabHovering = i;
+                    if (gui.inBounds(x + getXOffset() + ((IGridTab.TAB_WIDTH + 1) * j), y, IGridTab.TAB_WIDTH, IGridTab.TAB_HEIGHT - (i == selected.get() ? 2 : 7), mouseX, mouseY)) {
+                        this.tabHovering = i;
+                    }
+
+                    j++;
                 }
-
-                j++;
             }
         }
     }
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 6e33bc99c..d045b99de 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java
@@ -306,7 +306,7 @@ public class GuiGrid extends GuiBase implements IResizableDisplay {
             drawTexture(x + 172, y + getTopHeight() + (getVisibleRows() * 18) + 22, 240, ty * 16, 16, 16);
         }
 
-        tabs.drawForeground(x, y - tabs.getHeight(), mouseX, mouseY);
+        tabs.drawForeground(x, y - tabs.getHeight(), mouseX, mouseY, true);
 
         if (searchField != null) {
             searchField.drawTextBox();