Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

UI: Fix some logic dependent on screen tags.

Browse source 
9f38516 changed various tags but not code referencing them.
This commit is contained in:
Unknown W. Brackets 2022-09-17 13:29:33 -07:00
parent bf59640aa5
commit 6576b853e4
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Common/GPU/Vulkan/VulkanRenderManager.cpp
View file

@ -1409,7 +1409,6 @@ void VulkanRenderManager::Run(int frame) {
BeginSubmitFrame(frame);
FrameData &frameData = frameData_[frame];
VkCommandBuffer cmd = frameData.mainCmd;
queueRunner_.PreprocessSteps(frameData_[frame].steps);
//queueRunner_.LogSteps(stepsOnThread, false);
queueRunner_.RunSteps(frameData);

2
UI/InstallZipScreen.h
View file

@ -30,7 +30,7 @@ public:
virtual void update() override;
virtual bool key(const KeyInput &key) override;
const char *tag() const override { return "install_zip"; }
const char *tag() const override { return "InstallZip"; }
protected:
virtual void CreateViews() override;

5
UI/MainScreen.cpp
View file

@ -1432,11 +1432,12 @@ UI::EventReturn MainScreen::OnExit(UI::EventParams &e) {
}
void MainScreen::dialogFinished(const Screen *dialog, DialogResult result) {
if (dialog->tag() == "store") {
std::string tag = dialog->tag();
if (tag == "Store") {
backFromStore_ = true;
RecreateViews();
}
if (dialog->tag() == "game") {
if (tag == "Game") {
if (!restoreFocusGamePath_.empty() && UI::IsFocusMovementEnabled()) {
// Prevent the background from fading, since we just were displaying it.
highlightedGamePath_ = restoreFocusGamePath_;

2
UI/MemStickScreen.h
View file

@ -36,7 +36,7 @@ public:
MemStickScreen(bool initialSetup);
~MemStickScreen() {}
const char *tag() const override { return "memstick"; }
const char *tag() const override { return "MemStick"; }
enum Choice {
CHOICE_BROWSE_FOLDER,

6
UI/MiscScreens.cpp
View file

@ -387,13 +387,13 @@ void HandleCommonMessages(const char *message, const char *value, ScreenManager
MIPSComp::jit->ClearCache();
}
currentMIPS->UpdateCore((CPUCore)g_Config.iCpuCore);
} else if (!strcmp(message, "control mapping") && isActiveScreen && activeScreen->tag() != "control mapping") {
} else if (!strcmp(message, "control mapping") && isActiveScreen && std::string(activeScreen->tag()) != "ControlMapping") {
UpdateUIState(UISTATE_MENU);
manager->push(new ControlMappingScreen());
} else if (!strcmp(message, "display layout editor") && isActiveScreen && activeScreen->tag() != "display layout screen") {
} else if (!strcmp(message, "display layout editor") && isActiveScreen && std::string(activeScreen->tag()) != "DisplayLayout") {
UpdateUIState(UISTATE_MENU);
manager->push(new DisplayLayoutScreen());
} else if (!strcmp(message, "settings") && isActiveScreen && activeScreen->tag() != "settings") {
} else if (!strcmp(message, "settings") && isActiveScreen && std::string(activeScreen->tag()) != "GameSettings") {
UpdateUIState(UISTATE_MENU);
manager->push(new GameSettingsScreen(Path()));
} else if (!strcmp(message, "language screen") && isActiveScreen) {

4
UI/PauseScreen.cpp
View file

@ -172,7 +172,7 @@ public:
return slot_;
}
const char *tag() const override { return "screenshot_view"; }
const char *tag() const override { return "ScreenshotView"; }
protected:
bool FillVertical() const override { return false; }
@ -458,7 +458,7 @@ UI::EventReturn GamePauseScreen::OnState(UI::EventParams &e) {
void GamePauseScreen::dialogFinished(const Screen *dialog, DialogResult dr) {
std::string tag = dialog->tag();
if (tag == "screenshot" && dr == DR_OK) {
if (tag == "ScreenshotView" && dr == DR_OK) {
finishNextFrame_ = true;
} else {
// There may have been changes to our savestates, so let's recreate.