Skip to content

Inventory UI fixes #712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BenjaminAmos wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Inventory UI fixes #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67a9925
fix: fix keyboard navigation crash after all items sold
BenjaminAmos Apr 6, 2025
aeb21ad
fix: fix highlight after item removal
BenjaminAmos Apr 6, 2025
16ece12
fix: fix crash on shield removal
BenjaminAmos Apr 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions engine/src/main/java/org/destinationsol/game/item/ItemContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,12 @@ public List<SolItem> getSelectionAfterRemove(List<SolItem> selected) {
if (selected.size() > 1) {
return selected;
}
int idx = groups.indexOf(selected) + 1;
if (idx <= 0 || idx >= groupCount()) {
int groupCount = groupCount();
int idx = groups.indexOf(selected);
if (idx <= 0 || groupCount <= 1) {
return null;
}
return groups.get(idx);
return groups.get(idx == (groupCount - 1) ? idx - 1 : idx + 1);
}

public SolItem getRandom() {
Expand Down
4 changes: 4 additions & 0 deletions engine/src/main/java/org/destinationsol/game/ship/SolShip.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,10 @@ public boolean maybeUnequip(SolGame game, SolItem item, boolean unequip) {
}

public boolean maybeUnequip(SolGame game, SolItem item, boolean secondarySlot, boolean unequip) {
if (item == null) {
return false;
}

if (!secondarySlot) {
if (myHull.getEngine() == item) {
if (unequip) {
Expand Down
37 changes: 23 additions & 14 deletions engine/src/main/java/org/destinationsol/ui/nui/screens/InventoryScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ public class InventoryScreen extends NUIScreenLayer {
private ColumnLayout inventoryActionButtons;
private UIWarnButton closeButton;
private InventoryOperationsScreen inventoryOperations;
private List<SolItem> selectedItemGroup;
private int selectedIndex;
private int page;

Expand Down Expand Up @@ -102,6 +103,7 @@ public void initialise() {
nextButton.subscribe(button -> {
nextPage(button);
selectedIndex = 0;
selectedItemGroup = null;
updateItemRows();
});

Expand All @@ -110,6 +112,7 @@ public void initialise() {
previousButton.subscribe(button -> {
previousPage(button);
selectedIndex = 0;
selectedItemGroup = null;
updateItemRows();
});

Expand Down Expand Up @@ -250,8 +253,11 @@ public boolean onKeyEvent(NUIKeyEvent event) {
selectedIndex--;
previousButton.getClickSound().play(previousButton.getClickVolume());
}
selectedItemGroup = null;

items.seen(items.getGroup(selectedIndex + page * Const.ITEM_GROUPS_PER_PAGE));
if (items.groupCount() > 0) {
items.seen(items.getGroup(selectedIndex + page * Const.ITEM_GROUPS_PER_PAGE));
}

updateItemRows();
return true;
Expand All @@ -268,8 +274,11 @@ public boolean onKeyEvent(NUIKeyEvent event) {
selectedIndex++;
nextButton.getClickSound().play(nextButton.getClickVolume());
}
selectedItemGroup = null;

items.seen(items.getGroup(selectedIndex + page * Const.ITEM_GROUPS_PER_PAGE));
if (items.groupCount() > 0) {
items.seen(items.getGroup(selectedIndex + page * Const.ITEM_GROUPS_PER_PAGE));
}

updateItemRows();
return true;
Expand Down Expand Up @@ -314,18 +323,7 @@ public SolItem getSelectedItem() {
* @param itemGroup the item group to select
*/
public void setSelected(List<SolItem> itemGroup) {
ItemContainer items = inventoryOperations.getItems(solApplication.getGame());
if (!items.containsGroup(itemGroup)) {
selectedIndex = 0;
} else {
for (int groupNo = 0; groupNo < items.groupCount(); groupNo++) {
if (items.getGroup(groupNo) == itemGroup) {
page = groupNo / Const.ITEM_GROUPS_PER_PAGE;
selectedIndex = groupNo % Const.ITEM_GROUPS_PER_PAGE;
}
}
}

selectedItemGroup = itemGroup;
updateItemRows();
}

Expand Down Expand Up @@ -537,6 +535,17 @@ private UIWidget createItemRow(int index) {

public void updateItemRows() {
ItemContainer items = inventoryOperations.getItems(solApplication.getGame());
if (selectedItemGroup != null && items.containsGroup(selectedItemGroup)) {
for (int groupNo = 0; groupNo < items.groupCount(); groupNo++) {
if (items.getGroup(groupNo) == selectedItemGroup) {
page = groupNo / Const.ITEM_GROUPS_PER_PAGE;
selectedIndex = groupNo % Const.ITEM_GROUPS_PER_PAGE;
}
}
} else {
selectedItemGroup = items.groupCount() < selectedIndex ? items.getGroup(selectedIndex) : null;
}

Iterator<UIWidget> rowsIterator = inventoryRows.iterator();
rowsIterator.next(); // Ignore the first row, since it's the header.
UIWidget row = rowsIterator.next();
Expand Down