From b2afc8c9e0236e73c0189cd91c85a83a5ef148ba Mon Sep 17 00:00:00 2001 From: Caedis Date: Thu, 7 Mar 2024 04:01:02 -0600 Subject: [PATCH] Fix history being hidden when search is centered and item quantity bar is disabled (#468) --- src/main/java/codechicken/nei/ItemPanel.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/codechicken/nei/ItemPanel.java b/src/main/java/codechicken/nei/ItemPanel.java index 5e5f9354d..7a99bb6c5 100644 --- a/src/main/java/codechicken/nei/ItemPanel.java +++ b/src/main/java/codechicken/nei/ItemPanel.java @@ -168,7 +168,10 @@ public int getHeight(GuiContainer gui) { } protected int resizeFooter(GuiContainer gui) { - if (!NEIClientConfig.showItemQuantityWidget() && NEIClientConfig.isSearchWidgetCentered()) return 0; + if (!NEIClientConfig.showItemQuantityWidget() && NEIClientConfig.isSearchWidgetCentered() + && !NEIClientConfig.showHistoryPanelWidget()) { + return 0; + } final int BUTTON_SIZE = 20; more.w = less.w = BUTTON_SIZE; @@ -197,8 +200,13 @@ protected int resizeFooter(GuiContainer gui) { historyPanel.x = x; historyPanel.w = w; historyPanel.h = ItemsGrid.SLOT_SIZE * NEIClientConfig.getIntSetting("inventory.history.useRows"); - historyPanel.y = quantity.y - PanelWidget.PADDING - historyPanel.h; - return quantity.h + historyPanel.h + PanelWidget.PADDING * 2; + if (NEIClientConfig.showItemQuantityWidget() || !NEIClientConfig.isSearchWidgetCentered()) { + historyPanel.y = quantity.y - historyPanel.h - PanelWidget.PADDING; + } else { + historyPanel.y = y + h - historyPanel.h - PanelWidget.PADDING; + } + return ((NEIClientConfig.showItemQuantityWidget() || !NEIClientConfig.isSearchWidgetCentered()) ? quantity.h + : 0) + historyPanel.h + PanelWidget.PADDING * 2; } return quantity.h + PanelWidget.PADDING;