thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Avoid pushing a screen on top of itself.

Browse source 
In case someone doesn't realize they're on settings, or etc.
This commit is contained in:
Unknown W. Brackets 2017-12-02 11:45:59 -08:00
parent f1bd54148b
commit 5c81c67410
5 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
UI/ControlMappingScreen.h
View file

@ -33,6 +33,8 @@ class ControlMappingScreen : public UIDialogScreenWithBackground {
public: public:
ControlMappingScreen() {} ControlMappingScreen() {}
void KeyMapped(int pspkey); // Notification to let us refocus the same one after recreating views. void KeyMapped(int pspkey); // Notification to let us refocus the same one after recreating views.
std::string tag() const override { return "control mapping"; }
protected: protected:
virtual void CreateViews() override; virtual void CreateViews() override;
private: private:

1
UI/DisplayLayoutScreen.h
View file

@ -31,6 +31,7 @@ public:
virtual bool touch(const TouchInput &touch) override; virtual bool touch(const TouchInput &touch) override;
virtual void dialogFinished(const Screen *dialog, DialogResult result) override; virtual void dialogFinished(const Screen *dialog, DialogResult result) override;
virtual void onFinish(DialogResult reason) override; virtual void onFinish(DialogResult reason) override;
std::string tag() const override { return "display layout screen"; }
protected: protected:
virtual UI::EventReturn OnCenter(UI::EventParams &e); virtual UI::EventReturn OnCenter(UI::EventParams &e);

2
UI/GameScreen.h
View file

@ -35,7 +35,7 @@ public:
virtual void update(); virtual void update();
virtual std::string tag() const { return "game"; } std::string tag() const override { return "game"; }
protected: protected:
virtual void CreateViews(); virtual void CreateViews();

1
UI/GameSettingsScreen.h
View file

@ -30,6 +30,7 @@ public:
virtual void update(); virtual void update();
virtual void onFinish(DialogResult result); virtual void onFinish(DialogResult result);
std::string tag() const override { return "settings"; }
UI::Event OnRecentChanged; UI::Event OnRecentChanged;

6
UI/MiscScreens.cpp
View file

@ -165,13 +165,13 @@ void HandleCommonMessages(const char *message, const char *value, ScreenManager
if (PSP_IsInited()) { if (PSP_IsInited()) {
currentMIPS->UpdateCore((CPUCore)g_Config.iCpuCore); currentMIPS->UpdateCore((CPUCore)g_Config.iCpuCore);
} }
} else if (!strcmp(message, "control mapping") && isActiveScreen) { } else if (!strcmp(message, "control mapping") && isActiveScreen && activeScreen->tag() != "control mapping") {
UpdateUIState(UISTATE_MENU); UpdateUIState(UISTATE_MENU);
manager->push(new ControlMappingScreen()); manager->push(new ControlMappingScreen());
} else if (!strcmp(message, "display layout editor") && isActiveScreen) { } else if (!strcmp(message, "display layout editor") && isActiveScreen && activeScreen->tag() != "display layout screen") {
UpdateUIState(UISTATE_MENU); UpdateUIState(UISTATE_MENU);
manager->push(new DisplayLayoutScreen()); manager->push(new DisplayLayoutScreen());
} else if (!strcmp(message, "settings") && isActiveScreen) { } else if (!strcmp(message, "settings") && isActiveScreen && activeScreen->tag() != "settings") {
UpdateUIState(UISTATE_MENU); UpdateUIState(UISTATE_MENU);
manager->push(new GameSettingsScreen("")); manager->push(new GameSettingsScreen(""));
} else if (!strcmp(message, "language screen") && isActiveScreen) { } else if (!strcmp(message, "language screen") && isActiveScreen) {