preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-12 09:09:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16037 from unknownbrackets/ui-tags

Browse Source 
UI: Fix some logic dependent on screen tags
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2022-09-17 22:54:22 +02:00
2 parents bf59640aa5 6576b853e4
commit dae8d51256
6 files changed
+10 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Common/GPU/Vulkan/VulkanRenderManager.cpp
-1
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);
UI/InstallZipScreen.h
+1 -1
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;
UI/MainScreen.cpp
+3 -2
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_;
UI/MemStickScreen.h
+1 -1
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,
UI/MiscScreens.cpp
+3 -3
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) {
UI/PauseScreen.cpp
+2 -2
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.