Compare commits

..
Author SHA1 Message Date
Martin Robertz 7aec815348 sa 2024-12-31 20:58:10 +01:00
Martin Robertz 1aa6098913 Merge branch 'extend_subset_widget' into dev 2024-12-31 20:42:49 +01:00
Martin Robertz 27fc0b8b98 Revert "Merge branch 'master' into extend_subset_widget"
This reverts commit cf83b39b84, reversing
changes made to 946f1b3e53.
2024-12-31 20:41:29 +01:00
Martin Robertz c68ce11934 Merge remote-tracking branch 'slprime/extend_subset_widget' into dev
# Conflicts:
#	src/main/java/codechicken/nei/ItemPanel.java
2024-12-31 20:33:43 +01:00
Martin Robertz 0c554940a1 Merge remote-tracking branch 'slprime/fix_item_rendering_cache' into dev 2024-12-31 20:31:57 +01:00
Martin Robertz cf83b39b84 Merge branch 'master' into extend_subset_widget 2024-12-31 19:36:49 +01:00
Martin Robertz 0e986c9af4 Merge branch 'master' into fix_item_rendering_cache 2024-12-31 19:33:44 +01:00
Martin Robertz bf3c99f6e4 Merge branch 'master' into hide_items_until_searching 2024-12-31 19:33:31 +01:00
slprimeandslprime 6374c162ba Fixed NEI reload when changing dimension (#583)
Co-authored-by: slprime <[email protected]>
2024-12-31 19:33:21 +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
+3 -13
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,12 +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);
}