From 69c39c3bb9b9dc8aced46749491b84f6701482ce Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Fri, 12 Jun 2015 11:20:51 -0400 Subject: [PATCH] Better fix for tooltip issues (#2557) --- .../enderio/conduit/gui/ExternalConnectionContainer.java | 1 - .../enderio/conduit/gui/item/BasicItemFilterGui.java | 5 ++++- .../enderio/conduit/gui/item/ExistingItemFilterGui.java | 2 ++ .../enderio/conduit/gui/item/PowerItemFilterGui.java | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java index 0476818b..60c86937 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java +++ b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java @@ -113,7 +113,6 @@ public class ExternalConnectionContainer extends Container { } protected void filterChanged() { - System.out.println("filterChanged " + filterListeners.size()); for (FilterChangeListener list : filterListeners) { list.onFilterChanged(); } 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..7cb79c64 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java @@ -52,7 +52,6 @@ public class BasicItemFilterGui implements IItemFilterGui { this.yOffset = yOffset; this.buttonIdOffset = buttonIdOffset; - filter = filterContainer.getItemFilter(); isAdvanced = filter.isAdvanced(); @@ -119,7 +118,11 @@ public class BasicItemFilterGui implements IItemFilterGui { if(isStickyModeAvailable) { stickyB.onGuiInit(); stickyB.setSelected(activeFilter.isSticky()); + } else { + stickyB.detach(); } + } else { + stickyB.detach(); } useMetaB.onGuiInit(); diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java index 278ad914..ab45f047 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java @@ -131,6 +131,8 @@ public class ExistingItemFilterGui implements IItemFilterGui { if(!isInput) { stickyB.onGuiInit(); stickyB.setSelected(activeFilter.isSticky()); + } else { + stickyB.detach(); } useMetaB.onGuiInit(); diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/PowerItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/PowerItemFilterGui.java index 9515d769..ba4a6aad 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/PowerItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/PowerItemFilterGui.java @@ -64,6 +64,8 @@ public class PowerItemFilterGui implements IItemFilterGui { if(!isInput) { stickyB.onGuiInit(); stickyB.setSelected(filter.isSticky()); + } else { + stickyB.detach(); } int x0 = gui.getGuiLeft() + 80;