YourWishes/dusk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Exit delete mode on save select after delete or back button

Browse Source 
Previously deleting a save left the panel in delete mode, and pressing
back while in delete mode closed the whole save-select screen instead
of just returning to the normal load view.

Co-Authored-By: Claude Sonnet 5 <[email protected]>
This commit is contained in:
YourWishes
2026-09-09 21:38:28 -05:00
co-authored by Claude Sonnet 5
parent 03d753a83f
commit ed0b8c3911
1 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dusk/ui/dialog/save/uiselectsave.c
+31 -22
View File
@@ -60,6 +60,31 @@ void uiSelectSaveRefreshSlot(const uint8_t index) {
uiSaveSlotSetDisplayType(&UI_SELECT_SAVE.slots[index], displayType); uiSaveSlotSetDisplayType(&UI_SELECT_SAVE.slots[index], displayType);
} }
void uiSelectSaveSetActionLabel(const uiselectsavetype_t type) {
const char_t *labelKey = type == UI_SELECT_SAVE_TYPE_LOAD ?
"ui.select_save.delete_mode" : "ui.confirm.cancel";
errorret_t result = localeManagerGetString(
labelKey, UI_SELECT_SAVE.actionText, UI_SELECT_SAVE_ACTION_LABEL_MAX, 0
);
if(errorIsNotOk(result)) errorCatch(result);
UI_SELECT_SAVE.slotItems[UI_SELECT_SAVE_ACTION_INDEX].button.label.dirty =
true;
}
void uiSelectSaveSwitchType(const uiselectsavetype_t type) {
UI_SELECT_SAVE.type = type;
uisaveslotdisplaytype_t displayType = type == UI_SELECT_SAVE_TYPE_DELETE ?
UI_SAVE_SLOT_DISPLAY_TYPE_DELETE : UI_SAVE_SLOT_DISPLAY_TYPE_NORMAL;
for(uint8_t i = 0; i < SAVE_SLOT_COUNT; i++) {
uiSaveSlotSetDisplayType(&UI_SELECT_SAVE.slots[i], displayType);
}
uiSelectSaveSetActionLabel(type);
}
void uiSelectSaveDeleteConfirmed(const bool_t result, void *user) { void uiSelectSaveDeleteConfirmed(const bool_t result, void *user) {
if(!result) return; if(!result) return;
@@ -79,6 +104,7 @@ void uiSelectSaveDeleteConfirmed(const bool_t result, void *user) {
SAVE.caches[index] = slot.cachedData; SAVE.caches[index] = slot.cachedData;
uiSelectSaveSwitchType(UI_SELECT_SAVE_TYPE_LOAD);
uiSelectSaveRefreshSlot(index); uiSelectSaveRefreshSlot(index);
uiSaveSlotSetHighlighted(&UI_SELECT_SAVE.slots[index], true); uiSaveSlotSetHighlighted(&UI_SELECT_SAVE.slots[index], true);
} }
@@ -144,29 +170,11 @@ void uiSelectSaveNameEmptySlot(const uint8_t index) {
uiKeyboardOpen(&open); uiKeyboardOpen(&open);
} }
void uiSelectSaveSetActionLabel(const uiselectsavetype_t type) { bool_t uiSelectSaveMenuCancelled(const uimenu_t *menu) {
const char_t *labelKey = type == UI_SELECT_SAVE_TYPE_LOAD ? if(UI_SELECT_SAVE.type != UI_SELECT_SAVE_TYPE_DELETE) return false;
"ui.select_save.delete_mode" : "ui.confirm.cancel";
errorret_t result = localeManagerGetString( uiSelectSaveSwitchType(UI_SELECT_SAVE_TYPE_LOAD);
labelKey, UI_SELECT_SAVE.actionText, UI_SELECT_SAVE_ACTION_LABEL_MAX, 0 return true;
);
if(errorIsNotOk(result)) errorCatch(result);
UI_SELECT_SAVE.slotItems[UI_SELECT_SAVE_ACTION_INDEX].button.label.dirty =
true;
}
void uiSelectSaveSwitchType(const uiselectsavetype_t type) {
UI_SELECT_SAVE.type = type;
uisaveslotdisplaytype_t displayType = type == UI_SELECT_SAVE_TYPE_DELETE ?
UI_SAVE_SLOT_DISPLAY_TYPE_DELETE : UI_SAVE_SLOT_DISPLAY_TYPE_NORMAL;
for(uint8_t i = 0; i < SAVE_SLOT_COUNT; i++) {
uiSaveSlotSetDisplayType(&UI_SELECT_SAVE.slots[i], displayType);
}
uiSelectSaveSetActionLabel(type);
} }
void uiSelectSaveSlotSelected( void uiSelectSaveSlotSelected(
@@ -244,6 +252,7 @@ errorret_t uiSelectSaveInit(void) {
&UI_SELECT_SAVE.slotMenu, uiSelectSaveSlotSelected, uiSelectSaveSlotClosed, &UI_SELECT_SAVE.slotMenu, uiSelectSaveSlotSelected, uiSelectSaveSlotClosed,
uiSelectSaveSlotChanged uiSelectSaveSlotChanged
); );
uiMenuSetCancelCallback(&UI_SELECT_SAVE.slotMenu, uiSelectSaveMenuCancelled);
uiMenuSetItems( uiMenuSetItems(
&UI_SELECT_SAVE.slotMenu, UI_SELECT_SAVE.slotItems, SAVE_SLOT_COUNT, 1 &UI_SELECT_SAVE.slotMenu, UI_SELECT_SAVE.slotItems, SAVE_SLOT_COUNT, 1
); );