Skip to content

Save Entries Refresh Info Fix #384

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

Merged
Gunoshozo merged 1 commit into from
Jan 29, 2026
Merged

Save Entries Refresh Info Fix #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions src/games/chlcc/savemenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ SaveMenu::SaveMenu() : UI::SaveMenu() {
// Quick Save Pages initialization

for (int i = 0; i < Pages; i++) {
MainItems = new Widgets::Group(this);
MainItems->WrapFocus = false;
Widgets::Group* mainItems = new Widgets::Group(this);
mainItems->WrapFocus = false;

for (int j = 0; j < EntriesPerPage; j++) {
SaveEntryButton* saveEntryButton =
Expand All @@ -70,7 +70,7 @@ SaveMenu::SaveMenu() : UI::SaveMenu() {
EntryPositions[j], i, false, LockedSymbolSprite);
saveEntryButton->OnClickHandler = onClick;
saveEntryButton->AddThumbnail(EmptyThumbnailSprite, ThumbnailRelativePos);
MainItems->Add(saveEntryButton);
mainItems->Add(saveEntryButton);
EntryGrid[j] = saveEntryButton;
}

Expand All @@ -89,7 +89,7 @@ SaveMenu::SaveMenu() : UI::SaveMenu() {
EntryGrid[5]->SetFocus(EntryGrid[4], FDIR_UP);
EntryGrid[5]->SetFocus(EntryGrid[4], FDIR_DOWN);

QuickSavePages.push_back(MainItems);
QuickSavePages.push_back(mainItems);
}
// Maintaining focus across pages
for (auto pageItr = QuickSavePages.begin(); pageItr != QuickSavePages.end();
Expand Down Expand Up @@ -120,15 +120,15 @@ SaveMenu::SaveMenu() : UI::SaveMenu() {
// Full Save Pages initialization

for (int i = 0; i < Pages; i++) {
MainItems = new Widgets::Group(this);
MainItems->WrapFocus = false;
Widgets::Group* mainItems = new Widgets::Group(this);
mainItems->WrapFocus = false;

for (int j = 0; j < EntriesPerPage; j++) {
SaveEntryButton* saveEntryButton = new SaveEntryButton(
i * EntriesPerPage + j, SaveEntrySprite, EntryHighlightedSprite,
SaveEntrySprite, EntryPositions[j], i, true, LockedSymbolSprite);
saveEntryButton->OnClickHandler = onClick;
MainItems->Add(saveEntryButton);
mainItems->Add(saveEntryButton);
EntryGrid[j] = saveEntryButton;
}

Expand All @@ -147,7 +147,7 @@ SaveMenu::SaveMenu() : UI::SaveMenu() {
EntryGrid[5]->SetFocus(EntryGrid[4], FDIR_UP);
EntryGrid[5]->SetFocus(EntryGrid[4], FDIR_DOWN);

FullSavePages.push_back(MainItems);
FullSavePages.push_back(mainItems);
}

// Maintaining focus across pages
Expand Down
1 change: 0 additions & 1 deletion src/games/chlcc/savemenu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ class SaveMenu : public UI::SaveMenu {
std::vector<Widgets::Group*> FullSavePages;
std::vector<Widgets::Group*> QuickSavePages;
std::vector<Widgets::Group*>* SavePages;
Widgets::Group* MainItems;
Animation TitleFade;
Animation FromSystemMenuTransition;
SelectPromptAnimation SelectAnimation;
Expand Down
17 changes: 10 additions & 7 deletions src/games/chlcc/sysmesbox.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,20 +115,23 @@ void SysMesBox::Show() {
void SysMesBox::Hide() {
FadeAnimation.StartOut();
State = Hiding;
if (LastFocusedMenu != 0) {
UI::FocusedMenu = LastFocusedMenu;
LastFocusedMenu->IsFocused = true;
} else {
UI::FocusedMenu = 0;
}
IsFocused = false;
}

void SysMesBox::Update(float dt) {
UpdateInput(dt);

FadeAnimation.Update(dt);
if (State != Hidden) {
if (State == Hiding && FadeAnimation.IsOut()) {
if (LastFocusedMenu != 0) {
UI::FocusedMenu = LastFocusedMenu;
LastFocusedMenu->IsFocused = true;
} else {
UI::FocusedMenu = 0;
}
IsFocused = false;
}

if (FadeAnimation.IsIn()) State = Shown;
if (FadeAnimation.IsOut()) State = Hidden;

Expand Down
Loading