Compare commits

..
Author SHA1 Message Date
Martin Robertz 5b2e934284 fix 2024-12-26 23:33:14 +01:00
Martin Robertz d3184d4a4f Merge remote-tracking branch 'slprime/extend_subset_widget' into dev
# Conflicts:
#	src/main/java/codechicken/nei/ItemPanel.java
#	src/main/java/codechicken/nei/guihook/GuiContainerManager.java
2024-12-26 23:23:41 +01:00
Martin Robertz 581f909721 Merge remote-tracking branch 'slprime/option_integer_field_width' into dev 2024-12-26 23:21:48 +01:00
Martin Robertz dc51a285b2 Merge remote-tracking branch 'origin/colored-tooltips' into dev 2024-12-26 23:21:16 +01:00
Martin Robertz 43c2a09996 Merge remote-tracking branch 'slprime/fix_item_rendering_cache' into dev 2024-12-26 23:19:20 +01:00
Martin Robertz 8841e81cfc Merge remote-tracking branch 'slprime/hide_items_until_searching' into dev 2024-12-26 23:19:11 +01:00
+12 -3
View File
@@ -1,5 +1,9 @@
package codechicken.nei;
import static codechicken.nei.LayoutManager.less;
import static codechicken.nei.LayoutManager.more;
import static codechicken.nei.LayoutManager.quantity;
import java.awt.Color;
import java.util.ArrayList;
import java.util.HashMap;
@@ -398,15 +402,15 @@ public class ItemPanel extends PanelWidget {
historyPanel.h = ItemsGrid.SLOT_SIZE * NEIClientConfig.getIntSetting("inventory.history.useRows");
if (NEIClientConfig.showItemQuantityWidget() || !NEIClientConfig.isSearchWidgetCentered()) {
historyPanel.y = LayoutManager.quantity.y - historyPanel.h - PanelWidget.PADDING;
return LayoutManager.quantity.h + historyPanel.h + PanelWidget.PADDING * 2;
historyPanel.y = quantity.y - historyPanel.h - PanelWidget.PADDING;
return quantity.h + historyPanel.h + PanelWidget.PADDING * 2;
} else {
historyPanel.y = y + h - historyPanel.h;
return historyPanel.h + PanelWidget.PADDING;
}
}
return LayoutManager.quantity.h + PanelWidget.PADDING;
return quantity.h + PanelWidget.PADDING;
}
@Override
@@ -414,6 +418,11 @@ public class ItemPanel extends PanelWidget {
super.setVisible();
if (grid.getPerPage() > 0) {
if (NEIClientConfig.showItemQuantityWidget()) {
LayoutManager.addWidget(more);
LayoutManager.addWidget(less);
LayoutManager.addWidget(quantity);
}
if (!CollapsibleItems.isEmpty() && !grid.isEmpty()) {
LayoutManager.addWidget(toggleGroups);