preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-17 08:20:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

UI: Make switchScreen replace the whole screen stack

Browse Source 
It only replaced the top screen, but most callers switch from a dialog:
Play on the game screen, the store, the installers, the framedump
launcher. The screens under it stayed alive, so launching a game from the
game screen and exiting it left [MainScreen, MainScreen], one more each
time.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Henrik RydgårdandClaude Opus 5.5 committed 2026-10-12 16:21:10 +02:00
1 parent 82ae32d985
commit 08649f0f15
2 files changed
+12 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Common/UI/ScreenManager.cpp
+11 -10
View File
@@ -24,10 +24,6 @@ void ScreenManager::switchScreen(Screen *screen) {
return;
}
// Note that if a dialog is found, this will be a silent background switch that
// will only become apparent if the dialog is closed. The previous screen will stick around
// until that switch.
// TODO: is this still true?
if (!nextStack_.empty()) {
for (int i = 0; i < nextStack_.size(); i++) {
INFO_LOG(Log::UI, "NextStack contents[%d].screen->tag(): '%s'", i, nextStack_[i].screen->tag());
@@ -150,17 +146,22 @@ void ScreenManager::Update() {
void ScreenManager::switchToNext() {
if (nextStack_.empty()) {
ERROR_LOG(Log::System, "switchToNext: No nextStack_!");
return;
}
Layer temp = {nullptr, 0};
if (!stack_.empty()) {
temp = stack_.back();
temp.screen->focusChanged(ScreenFocusChange::FOCUS_LOST_TOP);
stack_.pop_back();
// Replaces the whole stack. Most callers switch from a dialog (Play on the game screen, the store,
// installers), and replacing only the top left the screens below alive, like one more MainScreen
// under every game launched that way.
std::vector<Layer> old = std::move(stack_);
stack_.clear();
if (!old.empty()) {
old.back().screen->focusChanged(ScreenFocusChange::FOCUS_LOST_TOP);
}
stack_.push_back(nextStack_.front());
nextStack_.front().screen->focusChanged(ScreenFocusChange::FOCUS_BECAME_TOP);
delete temp.screen;
for (auto iter = old.rbegin(); iter != old.rend(); ++iter) {
delete iter->screen;
}
UI::SetFocusedView(nullptr, UI::FocusFlags::CAUSE_SCREEN_CHANGE);
// When will this ever happen? Should handle focus here too?