From f6fe44b17857870c7cc730ad4d9199ec28898c24 Mon Sep 17 00:00:00 2001 From: austin Date: Wed, 14 May 2025 12:55:38 -0400 Subject: [PATCH] inventory ui work --- docs/src/progress/renderertodo.md | 7 +++++++ .../client/ui/menu/ingame/InventoryMainWindow.java | 14 ++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index f1b4b329..79295783 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -1757,8 +1757,15 @@ Non-ideal implementation of multiple inventory windows drawing at once Inventory packet for unified item transform requests from client Server inventory utility for unified item transform requests Toolbar ui uses unified item transfer flow +New inventory packet types +Unified container movement utils +(05/14/2025) +Break up InventoryUtils class +Update inventory utility logic +Fix styling for inventory panel ui element + diff --git a/src/main/java/electrosphere/client/ui/menu/ingame/InventoryMainWindow.java b/src/main/java/electrosphere/client/ui/menu/ingame/InventoryMainWindow.java index a5aafb20..3b00c265 100644 --- a/src/main/java/electrosphere/client/ui/menu/ingame/InventoryMainWindow.java +++ b/src/main/java/electrosphere/client/ui/menu/ingame/InventoryMainWindow.java @@ -22,16 +22,11 @@ import electrosphere.renderer.ui.events.NavigationEvent; * The main inventory display window */ public class InventoryMainWindow { - - /** - * Minimum width of the component - */ - public static final int MIN_WIDTH = 500; /** - * Minimum height of the component + * Maximum allowed height */ - public static final int MIN_HEIGHT = 500; + public static final int MAX_HEIGHT = 750; /** * Margins around the window @@ -108,11 +103,14 @@ public class InventoryMainWindow { throw new Error("Trying to recreate inventory window with null entity!"); } Window rVal = Window.createExpandableCenterAligned(Globals.renderingEngine.getOpenGLState()); - rVal.setMaxWidth(Globals.WINDOW_WIDTH / 2); rVal.setMarginBottom(MARGIN); rVal.setMarginLeft(MARGIN); rVal.setMarginRight(MARGIN); rVal.setMarginTop(MARGIN); + rVal.setWidth(MAX_HEIGHT); + rVal.setHeight(MAX_HEIGHT); + rVal.setMinWidth(MAX_HEIGHT); + rVal.setMinHeight(MAX_HEIGHT); String windowString; if(entity == Globals.playerEntity){