Compare commits

..
Author SHA1 Message Date
Martin Robertz 7a1065e789 Merge remote-tracking branch 'slprime/hide_items_until_searching' into dev 2024-12-29 11:56:47 +01:00
Martin Robertz 2cb60ea0cf Merge remote-tracking branch 'slprime/fix_item_rendering_cache' into dev 2024-12-29 11:56:40 +01:00
Martin Robertz a078d71746 Merge remote-tracking branch 'slprime/extend_subset_widget' into dev 2024-12-29 11:56:30 +01:00
Martin Robertz 1608665de0 Merge remote-tracking branch 'slprime/option_integer_field_width' into dev 2024-12-29 11:54:35 +01:00
Martin Robertz 946f1b3e53 Merge branch 'master' into extend_subset_widget 2024-12-29 10:14:22 +01:00
Martin Robertz f2cd82c8fa Merge branch 'master' into fix_item_rendering_cache 2024-12-29 10:10:22 +01:00
Martin Robertz 64cf3abf47 Merge branch 'master' into hide_items_until_searching 2024-12-29 10:10:06 +01:00
8dd36f1c4a Add RenderTooltipEvent Compat (#574)
Co-authored-by: Martin Robertz <[email protected]>
Co-authored-by: Maya <[email protected]>
2024-12-28 23:00:02 -06:00
4613ade468 Change OptionIntegerField Width (#575)
Co-authored-by: slprime <[email protected]>
Co-authored-by: Maya <[email protected]>
2024-12-29 02:36:53 +00:00
Maya 55c111dff0 Merge branch 'master' into option_integer_field_width 2024-12-28 20:32:48 -06:00
Martin Robertz c041c953c6 missing imports 2024-12-27 09:56:46 +01:00
Martin Robertz 2448008b91 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-27 09:55:10 +01:00
Martin Robertz 4e808cb44e Merge remote-tracking branch 'slprime/option_integer_field_width' into dev 2024-12-27 09:49:59 +01:00
Martin Robertz 827d42907d Merge remote-tracking branch 'origin/colored-tooltips' into dev 2024-12-27 09:49:40 +01:00
Martin Robertz ba659ee6ef Merge remote-tracking branch 'slprime/fix_item_rendering_cache' into dev 2024-12-27 09:49:34 +01:00
Martin Robertz a23e70c433 Merge remote-tracking branch 'slprime/hide_items_until_searching' into dev 2024-12-27 09:49:00 +01:00
+3 -12
View File
@@ -1,9 +1,5 @@
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;
@@ -402,15 +398,15 @@ public class ItemPanel extends PanelWidget {
historyPanel.h = ItemsGrid.SLOT_SIZE * NEIClientConfig.getIntSetting("inventory.history.useRows");
if (NEIClientConfig.showItemQuantityWidget() || !NEIClientConfig.isSearchWidgetCentered()) {
historyPanel.y = quantity.y - historyPanel.h - PanelWidget.PADDING;
return quantity.h + historyPanel.h + PanelWidget.PADDING * 2;
historyPanel.y = LayoutManager.quantity.y - historyPanel.h - PanelWidget.PADDING;
return LayoutManager.quantity.h + historyPanel.h + PanelWidget.PADDING * 2;
} else {
historyPanel.y = y + h - historyPanel.h;
return historyPanel.h + PanelWidget.PADDING;
}
}
return quantity.h + PanelWidget.PADDING;
return LayoutManager.quantity.h + PanelWidget.PADDING;
}
@Override
@@ -418,11 +414,6 @@ 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);