From f7b64b8d7f1d6428c954077d47aa026ec5485a3a Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Wed, 10 Jun 2015 20:56:58 +0200 Subject: [PATCH] #2557 only add the button tooltip to the GUI when the button had been added --- .../conduit/gui/item/BasicItemFilterGui.java | 2 +- .../crazypants/enderio/gui/IconButtonEIO.java | 21 ++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java index 7daa8bcc..7e1a4803 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java @@ -163,7 +163,7 @@ public class BasicItemFilterGui implements IItemFilterGui { } @Override - public void deactivate() { + public void deactivate() { useNbtB.detach(); useMetaB.detach(); useOreDictB.detach(); diff --git a/src/main/java/crazypants/enderio/gui/IconButtonEIO.java b/src/main/java/crazypants/enderio/gui/IconButtonEIO.java index 747c6172..f43a904e 100644 --- a/src/main/java/crazypants/enderio/gui/IconButtonEIO.java +++ b/src/main/java/crazypants/enderio/gui/IconButtonEIO.java @@ -23,6 +23,7 @@ public class IconButtonEIO extends GuiButton { private int xOrigin; private int yOrigin; + protected boolean isOnGui; protected IGuiScreen gui; protected String[] toolTipText; @@ -51,11 +52,11 @@ public class IconButtonEIO extends GuiButton { } protected void setToolTip(GuiToolTip newToolTip) { - if (toolTip != null) { + if (isOnGui && toolTip != null) { gui.removeToolTip(toolTip); } toolTip = newToolTip; - if (toolTip != null) { + if (isOnGui && toolTip != null) { gui.addToolTip(toolTip); } } @@ -65,17 +66,23 @@ public class IconButtonEIO extends GuiButton { } public void onGuiInit() { - gui.addButton(this); - if(toolTip != null) { - gui.addToolTip(toolTip); + if(!isOnGui) { + gui.addButton(this); + if(toolTip != null) { + gui.addToolTip(toolTip); + } + isOnGui = true; } xPosition = xOrigin + gui.getGuiLeft(); yPosition = yOrigin + gui.getGuiTop(); } public void detach() { - gui.removeToolTip(toolTip); - gui.removeButton(this); + if(isOnGui) { + gui.removeToolTip(toolTip); + gui.removeButton(this); + isOnGui = false; + } } public void setSize(int width, int height) {