From 7ffd72b32e978d4760c7d2c5b23ba46a8fac770e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 28 Oct 2025 23:40:42 +0100 Subject: [PATCH] Rename some screen classes --- UI/ControlMappingScreen.cpp | 10 ++++----- UI/ControlMappingScreen.h | 10 ++++----- UI/CustomButtonMappingScreen.h | 4 ++-- UI/CwCheatScreen.cpp | 4 ++-- UI/CwCheatScreen.h | 2 +- UI/DevScreens.cpp | 6 +++--- UI/DevScreens.h | 18 ++++++++-------- UI/DeveloperToolsScreen.cpp | 2 +- UI/DeveloperToolsScreen.h | 4 ++-- UI/DisplayLayoutScreen.cpp | 4 ++-- UI/DisplayLayoutScreen.h | 2 +- UI/DriverManagerScreen.cpp | 2 +- UI/DriverManagerScreen.h | 2 +- UI/GPUDriverTestScreen.h | 2 +- UI/GameScreen.cpp | 2 +- UI/GameScreen.h | 2 +- UI/GameSettingsScreen.cpp | 2 +- UI/GameSettingsScreen.h | 6 +++--- UI/IAPScreen.h | 2 +- UI/InstallZipScreen.cpp | 2 +- UI/InstallZipScreen.h | 2 +- UI/JitCompareScreen.cpp | 2 +- UI/JitCompareScreen.h | 2 +- UI/MainScreen.cpp | 4 ++-- UI/MainScreen.h | 4 ++-- UI/MemStickScreen.cpp | 4 ++-- UI/MemStickScreen.h | 6 +++--- UI/MiscScreens.cpp | 24 ++++++---------------- UI/MiscScreens.h | 34 ++++++++----------------------- UI/PauseScreen.cpp | 2 +- UI/PauseScreen.h | 2 +- UI/RemoteISOScreen.cpp | 6 +++--- UI/RemoteISOScreen.h | 4 ++-- UI/RetroAchievementScreens.cpp | 6 +++--- UI/RetroAchievementScreens.h | 10 ++++----- UI/SavedataScreen.cpp | 2 +- UI/SavedataScreen.h | 4 ++-- UI/Store.cpp | 6 ++---- UI/Store.h | 2 +- UI/SystemInfoScreen.cpp | 2 +- UI/SystemInfoScreen.h | 4 ++-- UI/TabbedDialogScreen.cpp | 18 ++++++++-------- UI/TabbedDialogScreen.h | 4 ++-- UI/TiltAnalogSettingsScreen.cpp | 2 +- UI/TiltAnalogSettingsScreen.h | 4 ++-- UI/TouchControlLayoutScreen.cpp | 2 +- UI/TouchControlLayoutScreen.h | 4 ++-- UI/TouchControlVisibilityScreen.h | 8 ++++---- UI/UploadScreen.h | 2 +- 49 files changed, 116 insertions(+), 148 deletions(-) diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp index 6a11266ba4..ae96df6b2e 100644 --- a/UI/ControlMappingScreen.cpp +++ b/UI/ControlMappingScreen.cpp @@ -318,7 +318,7 @@ void ControlMappingScreen::update() { RecreateViews(); } - UIDialogScreenWithGameBackground::update(); + UIBaseDialogScreen::update(); SetVRAppMode(VRAppMode::VR_MENU_MODE); } @@ -504,7 +504,7 @@ void KeyMappingNewMouseKeyDialog::axis(const AxisInput &axis) { } } -AnalogCalibrationScreen::AnalogCalibrationScreen(const Path &gamePath) : UIDialogScreenWithGameBackground(gamePath) { +AnalogCalibrationScreen::AnalogCalibrationScreen(const Path &gamePath) : UIBaseDialogScreen(gamePath) { mapper_.SetCallbacks( [](int vkey, bool down) {}, [](int vkey, float analogValue) {}, @@ -953,7 +953,7 @@ bool VisualMappingScreen::key(const KeyInput &key) { } } } - return UIDialogScreenWithGameBackground::key(key); + return UIBaseDialogScreen::key(key); } void VisualMappingScreen::axis(const AxisInput &axis) { @@ -976,11 +976,11 @@ void VisualMappingScreen::axis(const AxisInput &axis) { break; } } - UIDialogScreenWithGameBackground::axis(axis); + UIBaseDialogScreen::axis(axis); } void VisualMappingScreen::resized() { - UIDialogScreenWithGameBackground::resized(); + UIBaseDialogScreen::resized(); RecreateViews(); } diff --git a/UI/ControlMappingScreen.h b/UI/ControlMappingScreen.h index 8ceabcfed0..d26d093c8f 100644 --- a/UI/ControlMappingScreen.h +++ b/UI/ControlMappingScreen.h @@ -34,9 +34,9 @@ class SingleControlMapper; -class ControlMappingScreen : public UIDialogScreenWithGameBackground { +class ControlMappingScreen : public UIBaseDialogScreen { public: - explicit ControlMappingScreen(const Path &gamePath) : UIDialogScreenWithGameBackground(gamePath) { + explicit ControlMappingScreen(const Path &gamePath) : UIBaseDialogScreen(gamePath) { categoryToggles_[0] = true; categoryToggles_[1] = true; categoryToggles_[2] = true; @@ -120,7 +120,7 @@ private: class JoystickHistoryView; -class AnalogCalibrationScreen : public UIDialogScreenWithGameBackground { +class AnalogCalibrationScreen : public UIBaseDialogScreen { public: AnalogCalibrationScreen(const Path &gamePath); @@ -149,9 +149,9 @@ private: class MockPSP; -class VisualMappingScreen : public UIDialogScreenWithGameBackground { +class VisualMappingScreen : public UIBaseDialogScreen { public: - VisualMappingScreen(const Path &gamePath) : UIDialogScreenWithGameBackground(gamePath) {} + VisualMappingScreen(const Path &gamePath) : UIBaseDialogScreen(gamePath) {} const char *tag() const override { return "VisualMapping"; } diff --git a/UI/CustomButtonMappingScreen.h b/UI/CustomButtonMappingScreen.h index 2200e6e803..5270cfaeaf 100644 --- a/UI/CustomButtonMappingScreen.h +++ b/UI/CustomButtonMappingScreen.h @@ -24,9 +24,9 @@ namespace UI { class CheckBox; } -class CustomButtonMappingScreen : public UIDialogScreenWithGameBackground { +class CustomButtonMappingScreen : public UIBaseDialogScreen { public: - CustomButtonMappingScreen(const Path &gamePath, int id) : UIDialogScreenWithGameBackground(gamePath), id_(id) {} + CustomButtonMappingScreen(const Path &gamePath, int id) : UIBaseDialogScreen(gamePath), id_(id) {} const char *tag() const override { return "CustomButton"; } diff --git a/UI/CwCheatScreen.cpp b/UI/CwCheatScreen.cpp index 8cbeed314f..ba35817036 100644 --- a/UI/CwCheatScreen.cpp +++ b/UI/CwCheatScreen.cpp @@ -40,7 +40,7 @@ static Path GetGlobalCheatFilePath() { } CwCheatScreen::CwCheatScreen(const Path &gamePath) - : UIDialogScreenWithGameBackground(gamePath) { + : UIBaseDialogScreen(gamePath) { } CwCheatScreen::~CwCheatScreen() { @@ -155,7 +155,7 @@ void CwCheatScreen::update() { fileCheckCounter_ = 0; } - UIDialogScreenWithGameBackground::update(); + UIBaseDialogScreen::update(); } void CwCheatScreen::onFinish(DialogResult result) { diff --git a/UI/CwCheatScreen.h b/UI/CwCheatScreen.h index 0a6118bc87..4106fe8dd8 100644 --- a/UI/CwCheatScreen.h +++ b/UI/CwCheatScreen.h @@ -28,7 +28,7 @@ struct CheatFileInfo; class CWCheatEngine; -class CwCheatScreen : public UIDialogScreenWithGameBackground { +class CwCheatScreen : public UIBaseDialogScreen { public: CwCheatScreen(const Path &gamePath); ~CwCheatScreen(); diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp index 956916330e..6ac21ce4f4 100644 --- a/UI/DevScreens.cpp +++ b/UI/DevScreens.cpp @@ -253,7 +253,7 @@ void LogViewScreen::UpdateLog() { } void LogViewScreen::update() { - UIDialogScreenWithBackground::update(); + UIBaseDialogScreen::update(); if (toBottom_) { toBottom_ = false; scroll_->ScrollToBottom(); @@ -524,7 +524,7 @@ bool ShaderViewScreen::key(const KeyInput &ki) { System_CopyStringToClipboard(gpu->DebugGetShaderString(id_, type_, SHADER_STRING_SHORT_DESC)); } } - return UIDialogScreenWithBackground::key(ki); + return UIBaseDialogScreen::key(ki); } @@ -616,7 +616,7 @@ void FrameDumpTestScreen::update() { } void TouchTestScreen::touch(const TouchInput &touch) { - UIDialogScreenWithGameBackground::touch(touch); + UIBaseDialogScreen::touch(touch); if (touch.flags & TOUCH_DOWN) { bool found = false; for (int i = 0; i < MAX_TOUCH_POINTS; i++) { diff --git a/UI/DevScreens.h b/UI/DevScreens.h index 0b51afeb84..d63f2dde1e 100644 --- a/UI/DevScreens.h +++ b/UI/DevScreens.h @@ -47,7 +47,7 @@ private: Path gamePath_; }; -class JitDebugScreen : public UIDialogScreenWithBackground { +class JitDebugScreen : public UIBaseDialogScreen { public: JitDebugScreen() {} void CreateViews() override; @@ -59,7 +59,7 @@ private: void OnDisableAll(UI::EventParams &e); }; -class LogConfigScreen : public UIDialogScreenWithBackground { +class LogConfigScreen : public UIBaseDialogScreen { public: LogConfigScreen() {} void CreateViews() override; @@ -74,7 +74,7 @@ private: void OnLogLevelChange(UI::EventParams &e); }; -class LogViewScreen : public UIDialogScreenWithBackground { +class LogViewScreen : public UIBaseDialogScreen { public: void CreateViews() override; void update() override; @@ -108,9 +108,9 @@ protected: void CreatePopupContents(UI::ViewGroup *parent) override; }; -class ShaderListScreen : public TabbedUIDialogScreenWithGameBackground { +class ShaderListScreen : public UITabbedBaseDialogScreen { public: - ShaderListScreen() : TabbedUIDialogScreenWithGameBackground(Path()) {} + ShaderListScreen() : UITabbedBaseDialogScreen(Path()) {} void CreateTabs() override; const char *tag() const override { return "ShaderList"; } @@ -122,7 +122,7 @@ private: void OnShaderClick(UI::EventParams &e); }; -class ShaderViewScreen : public UIDialogScreenWithBackground { +class ShaderViewScreen : public UIBaseDialogScreen { public: ShaderViewScreen(std::string id, DebugShaderType type) : id_(id), type_(type) {} @@ -137,7 +137,7 @@ private: DebugShaderType type_; }; -class FrameDumpTestScreen : public UIDialogScreenWithBackground { +class FrameDumpTestScreen : public UIBaseDialogScreen { public: FrameDumpTestScreen(); ~FrameDumpTestScreen(); @@ -155,9 +155,9 @@ private: std::shared_ptr dumpDownload_; }; -class TouchTestScreen : public UIDialogScreenWithGameBackground { +class TouchTestScreen : public UIBaseDialogScreen { public: - TouchTestScreen(const Path &gamePath) : UIDialogScreenWithGameBackground(gamePath) { + TouchTestScreen(const Path &gamePath) : UIBaseDialogScreen(gamePath) { for (int i = 0; i < MAX_TOUCH_POINTS; i++) { touches_[i].id = -1; } diff --git a/UI/DeveloperToolsScreen.cpp b/UI/DeveloperToolsScreen.cpp index 3977bb2350..0d43ad237e 100644 --- a/UI/DeveloperToolsScreen.cpp +++ b/UI/DeveloperToolsScreen.cpp @@ -711,7 +711,7 @@ void DeveloperToolsScreen::OnMIPSTracerClearTracer(UI::EventParams &e) { } void DeveloperToolsScreen::update() { - UIDialogScreenWithBackground::update(); + UIBaseDialogScreen::update(); allowDebugger_ = !WebServerStopped(WebServerFlags::DEBUGGER); canAllowDebugger_ = !WebServerStopping(WebServerFlags::DEBUGGER); } diff --git a/UI/DeveloperToolsScreen.h b/UI/DeveloperToolsScreen.h index dbbef1babb..009963da40 100644 --- a/UI/DeveloperToolsScreen.h +++ b/UI/DeveloperToolsScreen.h @@ -4,9 +4,9 @@ #include "UI/TabbedDialogScreen.h" -class DeveloperToolsScreen : public TabbedUIDialogScreenWithGameBackground { +class DeveloperToolsScreen : public UITabbedBaseDialogScreen { public: - DeveloperToolsScreen(const Path &gamePath) : TabbedUIDialogScreenWithGameBackground(gamePath) {} + DeveloperToolsScreen(const Path &gamePath) : UITabbedBaseDialogScreen(gamePath) {} void CreateTabs() override; void update() override; diff --git a/UI/DisplayLayoutScreen.cpp b/UI/DisplayLayoutScreen.cpp index c06c343269..a1182bfe49 100644 --- a/UI/DisplayLayoutScreen.cpp +++ b/UI/DisplayLayoutScreen.cpp @@ -117,7 +117,7 @@ private: float startDisplayOffsetY_ = -1.0f; }; -DisplayLayoutScreen::DisplayLayoutScreen(const Path &filename) : UIDialogScreenWithGameBackground(filename) {} +DisplayLayoutScreen::DisplayLayoutScreen(const Path &filename) : UIBaseDialogScreen(filename) {} void DisplayLayoutScreen::DrawBackground(UIContext &dc) { if (PSP_GetBootState() == BootState::Complete && !g_Config.bSkipBufferEffects) { @@ -181,7 +181,7 @@ static std::string PostShaderTranslateName(std::string_view value) { } void DisplayLayoutScreen::sendMessage(UIMessage message, const char *value) { - UIDialogScreenWithGameBackground::sendMessage(message, value); + UIBaseDialogScreen::sendMessage(message, value); if (message == UIMessage::POSTSHADER_UPDATED) { g_Config.bShaderChainRequires60FPS = PostShaderChainRequires60FPS(GetFullPostShadersChain(g_Config.vPostShaderNames)); RecreateViews(); diff --git a/UI/DisplayLayoutScreen.h b/UI/DisplayLayoutScreen.h index be6e875770..8290c45456 100644 --- a/UI/DisplayLayoutScreen.h +++ b/UI/DisplayLayoutScreen.h @@ -29,7 +29,7 @@ namespace UI { class ChoiceStrip; } -class DisplayLayoutScreen : public UIDialogScreenWithGameBackground { +class DisplayLayoutScreen : public UIBaseDialogScreen { public: DisplayLayoutScreen(const Path &filename); void CreateViews() override; diff --git a/UI/DriverManagerScreen.cpp b/UI/DriverManagerScreen.cpp index 05924d2136..de9c9ad06d 100644 --- a/UI/DriverManagerScreen.cpp +++ b/UI/DriverManagerScreen.cpp @@ -142,7 +142,7 @@ DriverChoice::DriverChoice(const std::string &driverName, bool current, UI::Layo } } -DriverManagerScreen::DriverManagerScreen(const Path & gamePath) : TabbedUIDialogScreenWithGameBackground(gamePath) {} +DriverManagerScreen::DriverManagerScreen(const Path & gamePath) : UITabbedBaseDialogScreen(gamePath) {} void DriverManagerScreen::CreateTabs() { using namespace UI; diff --git a/UI/DriverManagerScreen.h b/UI/DriverManagerScreen.h index 2570e104f2..8a9fff68cc 100644 --- a/UI/DriverManagerScreen.h +++ b/UI/DriverManagerScreen.h @@ -8,7 +8,7 @@ // Per-game settings screen - enables you to configure graphic options, control options, etc // per game. -class DriverManagerScreen : public TabbedUIDialogScreenWithGameBackground { +class DriverManagerScreen : public UITabbedBaseDialogScreen { public: DriverManagerScreen(const Path &gamePath); diff --git a/UI/GPUDriverTestScreen.h b/UI/GPUDriverTestScreen.h index 7421603de8..b77862b8cf 100644 --- a/UI/GPUDriverTestScreen.h +++ b/UI/GPUDriverTestScreen.h @@ -10,7 +10,7 @@ #include "UI/MiscScreens.h" #include "Common/GPU/thin3d.h" -class GPUDriverTestScreen : public UIDialogScreenWithBackground { +class GPUDriverTestScreen : public UIBaseDialogScreen { public: GPUDriverTestScreen(); ~GPUDriverTestScreen(); diff --git a/UI/GameScreen.cpp b/UI/GameScreen.cpp index b5fa6e1f1b..5bad4f71e5 100644 --- a/UI/GameScreen.cpp +++ b/UI/GameScreen.cpp @@ -53,7 +53,7 @@ constexpr GameInfoFlags g_desiredFlags = GameInfoFlags::PARAM_SFO | GameInfoFlags::ICON | GameInfoFlags::PIC0 | GameInfoFlags::PIC1 | GameInfoFlags::UNCOMPRESSED_SIZE | GameInfoFlags::SIZE; -GameScreen::GameScreen(const Path &gamePath, bool inGame) : UIDialogScreenWithGameBackground(gamePath), inGame_(inGame) { +GameScreen::GameScreen(const Path &gamePath, bool inGame) : UIBaseDialogScreen(gamePath), inGame_(inGame) { g_BackgroundAudio.SetGame(gamePath); System_PostUIMessage(UIMessage::GAME_SELECTED, gamePath.ToString()); diff --git a/UI/GameScreen.h b/UI/GameScreen.h index 1024f08b90..f1b35e7b9e 100644 --- a/UI/GameScreen.h +++ b/UI/GameScreen.h @@ -33,7 +33,7 @@ class NoticeView; // Uses GameInfoCache heavily to implement the functionality. // Should possibly merge this with the PauseScreen. -class GameScreen : public UIDialogScreenWithGameBackground { +class GameScreen : public UIBaseDialogScreen { public: GameScreen(const Path &gamePath, bool inGame); ~GameScreen(); diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 285d369857..39806f4ab6 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -115,7 +115,7 @@ void SetMemStickDirDarwin(int requesterToken) { #endif GameSettingsScreen::GameSettingsScreen(const Path &gamePath, std::string gameID, bool editThenRestore) - : TabbedUIDialogScreenWithGameBackground(gamePath), gameID_(gameID), editThenRestore_(editThenRestore) { + : UITabbedBaseDialogScreen(gamePath), gameID_(gameID), editThenRestore_(editThenRestore) { prevInflightFrames_ = g_Config.iInflightFrames; analogSpeedMapped_ = KeyMap::InputMappingsFromPspButton(VIRTKEY_SPEED_ANALOG, nullptr, true); } diff --git a/UI/GameSettingsScreen.h b/UI/GameSettingsScreen.h index 8cec893d88..3ebfb674f9 100644 --- a/UI/GameSettingsScreen.h +++ b/UI/GameSettingsScreen.h @@ -31,7 +31,7 @@ class Path; // Per-game settings screen - enables you to configure graphic options, control options, etc // per game. -class GameSettingsScreen : public TabbedUIDialogScreenWithGameBackground { +class GameSettingsScreen : public UITabbedBaseDialogScreen { public: GameSettingsScreen(const Path &gamePath, std::string gameID = "", bool editThenRestore = false); @@ -183,9 +183,9 @@ private: }; -class GestureMappingScreen : public UIDialogScreenWithGameBackground { +class GestureMappingScreen : public UIBaseDialogScreen { public: - GestureMappingScreen(const Path &gamePath) : UIDialogScreenWithGameBackground(gamePath) {} + GestureMappingScreen(const Path &gamePath) : UIBaseDialogScreen(gamePath) {} void CreateViews() override; const char *tag() const override { return "GestureMapping"; } diff --git a/UI/IAPScreen.h b/UI/IAPScreen.h index f4143bbd95..b48aab8433 100644 --- a/UI/IAPScreen.h +++ b/UI/IAPScreen.h @@ -6,7 +6,7 @@ #include "UI/MiscScreens.h" -class IAPScreen : public UIDialogScreenWithBackground { +class IAPScreen : public UIBaseDialogScreen { public: void CreateViews() override; const char *tag() const override { return "IAP"; } diff --git a/UI/InstallZipScreen.cpp b/UI/InstallZipScreen.cpp index a64c7ee573..81667099f7 100644 --- a/UI/InstallZipScreen.cpp +++ b/UI/InstallZipScreen.cpp @@ -258,5 +258,5 @@ void InstallZipScreen::update() { std::shared_ptr ginfo = g_gameInfoCache->GetInfo(screenManager()->getDrawContext(), savedataToOverwrite_, GameInfoFlags::FILE_TYPE | GameInfoFlags::PARAM_SFO | GameInfoFlags::ICON | GameInfoFlags::SIZE); existingSaveView_->UpdateGame(ginfo.get()); } - UIDialogScreenWithBackground::update(); + UIBaseDialogScreen::update(); } diff --git a/UI/InstallZipScreen.h b/UI/InstallZipScreen.h index 6a6be5e4ab..f14fe8e692 100644 --- a/UI/InstallZipScreen.h +++ b/UI/InstallZipScreen.h @@ -28,7 +28,7 @@ class SavedataView; -class InstallZipScreen : public UIDialogScreenWithBackground { +class InstallZipScreen : public UIBaseDialogScreen { public: InstallZipScreen(const Path &zipPath); void update() override; diff --git a/UI/JitCompareScreen.cpp b/UI/JitCompareScreen.cpp index 5386b5ec15..d7499a15c8 100644 --- a/UI/JitCompareScreen.cpp +++ b/UI/JitCompareScreen.cpp @@ -8,7 +8,7 @@ #include "Core/MIPS/JitCommon/JitCommon.h" #include "Core/MIPS/JitCommon/JitState.h" -JitCompareScreen::JitCompareScreen() : TabbedUIDialogScreenWithGameBackground(Path()) { +JitCompareScreen::JitCompareScreen() : UITabbedBaseDialogScreen(Path()) { if (!MIPSComp::jit) { return; } diff --git a/UI/JitCompareScreen.h b/UI/JitCompareScreen.h index 8b1278b29d..78aba0375e 100644 --- a/UI/JitCompareScreen.h +++ b/UI/JitCompareScreen.h @@ -3,7 +3,7 @@ #include "UI/MiscScreens.h" #include "UI/TabbedDialogScreen.h" -class JitCompareScreen : public TabbedUIDialogScreenWithGameBackground { +class JitCompareScreen : public UITabbedBaseDialogScreen { public: JitCompareScreen(); void CreateTabs() override; diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp index 9ff8a04844..844ac03eef 100644 --- a/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp @@ -1366,7 +1366,7 @@ bool MainScreen::key(const KeyInput &touch) { searchKeyModifier_ = false; } - return UIScreenWithBackground::key(touch); + return UIBaseScreen::key(touch); } void MainScreen::OnAllowStorage(UI::EventParams &e) { @@ -1375,7 +1375,7 @@ void MainScreen::OnAllowStorage(UI::EventParams &e) { void MainScreen::sendMessage(UIMessage message, const char *value) { // Always call the base class method first to handle the most common messages. - UIScreenWithBackground::sendMessage(message, value); + UIBaseScreen::sendMessage(message, value); if (message == UIMessage::REQUEST_GAME_BOOT) { LaunchFile(screenManager(), this, Path(value)); diff --git a/UI/MainScreen.h b/UI/MainScreen.h index ed918b6142..bf52775f67 100644 --- a/UI/MainScreen.h +++ b/UI/MainScreen.h @@ -118,7 +118,7 @@ private: class RemoteISOBrowseScreen; -class MainScreen : public UIScreenWithBackground { +class MainScreen : public UIBaseScreen { public: MainScreen(); ~MainScreen(); @@ -180,7 +180,7 @@ protected: friend class RemoteISOBrowseScreen; }; -class UmdReplaceScreen : public UIDialogScreenWithBackground { +class UmdReplaceScreen : public UIBaseDialogScreen { public: const char *tag() const override { return "UmdReplace"; } diff --git a/UI/MemStickScreen.cpp b/UI/MemStickScreen.cpp index aa1f6ccb22..0b1b6050b9 100644 --- a/UI/MemStickScreen.cpp +++ b/UI/MemStickScreen.cpp @@ -447,7 +447,7 @@ void MemStickScreen::dialogFinished(const Screen *dialog, DialogResult result) { } void MemStickScreen::update() { - UIDialogScreenWithBackground::update(); + UIBaseDialogScreen::update(); if (done_) { TriggerFinish(DialogResult::DR_OK); done_ = false; @@ -567,7 +567,7 @@ void ConfirmMemstickMoveScreen::OnMoveDataClick(UI::EventParams ¶ms) { } void ConfirmMemstickMoveScreen::update() { - UIDialogScreenWithBackground::update(); + UIBaseDialogScreen::update(); auto ms = GetI18NCategory(I18NCat::MEMSTICK); if (moveDataTask_) { diff --git a/UI/MemStickScreen.h b/UI/MemStickScreen.h index d8ddb88c00..6e385972d9 100644 --- a/UI/MemStickScreen.h +++ b/UI/MemStickScreen.h @@ -35,7 +35,7 @@ class NoticeView; // MemStickScreen - let's you configure your memory stick directory. // Currently only useful for Android. -class MemStickScreen : public UIDialogScreenWithBackground { +class MemStickScreen : public UIBaseDialogScreen { public: MemStickScreen(bool initialSetup); ~MemStickScreen() = default; @@ -58,7 +58,7 @@ protected: // Simple anti-flicker due to delayed finish. if (!done_) { // render as usual. - return UIDialogScreenWithBackground::render(mode); + return UIBaseDialogScreen::render(mode); } else { // no render. black frame insertion is better than flicker. } @@ -97,7 +97,7 @@ struct SpaceResult { int64_t bytesFree; }; -class ConfirmMemstickMoveScreen : public UIDialogScreenWithBackground { +class ConfirmMemstickMoveScreen : public UIBaseDialogScreen { public: ConfirmMemstickMoveScreen(const Path &newMemstickFolder, bool initialSetup); ~ConfirmMemstickMoveScreen(); diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp index f3c5be363a..c6d54cea0a 100644 --- a/UI/MiscScreens.cpp +++ b/UI/MiscScreens.cpp @@ -585,38 +585,26 @@ void BackgroundScreen::sendMessage(UIMessage message, const char *value) { } } -void UIScreenWithGameBackground::sendMessage(UIMessage message, const char *value) { +void UIBaseDialogScreen::sendMessage(UIMessage message, const char *value) { if (message == UIMessage::SHOW_SETTINGS && screenManager()->topScreen() == this) { screenManager()->push(new GameSettingsScreen(gamePath_)); } else { - UIScreenWithBackground::sendMessage(message, value); + HandleCommonMessages(message, value, screenManager(), this); } } -void UIDialogScreenWithGameBackground::sendMessage(UIMessage message, const char *value) { - if (message == UIMessage::SHOW_SETTINGS && screenManager()->topScreen() == this) { - screenManager()->push(new GameSettingsScreen(gamePath_)); - } else { - UIDialogScreenWithBackground::sendMessage(message, value); - } -} - -void UIScreenWithBackground::sendMessage(UIMessage message, const char *value) { +void UIBaseScreen::sendMessage(UIMessage message, const char *value) { HandleCommonMessages(message, value, screenManager(), this); } -void UIDialogScreenWithBackground::AddStandardBack(UI::ViewGroup *parent) { +void UIBaseDialogScreen::AddStandardBack(UI::ViewGroup *parent) { using namespace UI; auto di = GetI18NCategory(I18NCat::DIALOG); parent->Add(new Choice(di->T("Back"), "", false, new AnchorLayoutParams(190, WRAP_CONTENT, 10, NONE, NONE, 10)))->OnClick.Handle(this, &UIScreen::OnBack); } -void UIDialogScreenWithBackground::sendMessage(UIMessage message, const char *value) { - HandleCommonMessages(message, value, screenManager(), this); -} - PromptScreen::PromptScreen(const Path &gamePath, std::string_view message, std::string_view yesButtonText, std::string_view noButtonText, std::function callback) - : UIDialogScreenWithGameBackground(gamePath), message_(message), callback_(callback) { + : UIBaseDialogScreen(gamePath), message_(message), callback_(callback) { yesButtonText_ = yesButtonText; noButtonText_ = noButtonText; } @@ -670,7 +658,7 @@ void PromptScreen::TriggerFinish(DialogResult result) { if (callback_) { callback_(result == DR_OK || result == DR_YES); } - UIDialogScreenWithBackground::TriggerFinish(result); + UIBaseDialogScreen::TriggerFinish(result); } TextureShaderScreen::TextureShaderScreen(std::string_view title) : ListPopupScreen(title) {} diff --git a/UI/MiscScreens.h b/UI/MiscScreens.h index 078323f736..88943fa8c8 100644 --- a/UI/MiscScreens.h +++ b/UI/MiscScreens.h @@ -50,44 +50,26 @@ private: // This doesn't have anything to do with the background anymore. It's just a PPSSPP UIScreen // that knows how handle sendMessage properly. Same for all the below. -class UIScreenWithBackground : public UIScreen { +class UIBaseScreen : public UIScreen { public: - UIScreenWithBackground() : UIScreen() {} + UIBaseScreen() : UIScreen() {} protected: void sendMessage(UIMessage message, const char *value) override; }; -class UIScreenWithGameBackground : public UIScreenWithBackground { +class UIBaseDialogScreen : public UIDialogScreen { public: - UIScreenWithGameBackground(const Path &gamePath) : UIScreenWithBackground(), gamePath_(gamePath) {} - void sendMessage(UIMessage message, const char *value) override; -protected: - Path gamePath_; - - bool forceTransparent_ = false; - bool darkenGameBackground_ = true; -}; - -class UIDialogScreenWithBackground : public UIDialogScreen { -public: - UIDialogScreenWithBackground() : UIDialogScreen() {} + UIBaseDialogScreen() : UIDialogScreen(), gamePath_() {} + explicit UIBaseDialogScreen(const Path &gamePath) : UIDialogScreen(), gamePath_(gamePath) {} protected: void sendMessage(UIMessage message, const char *value) override; void AddStandardBack(UI::ViewGroup *parent); -}; - -class UIDialogScreenWithGameBackground : public UIDialogScreenWithBackground { -public: - UIDialogScreenWithGameBackground(const Path &gamePath) - : UIDialogScreenWithBackground(), gamePath_(gamePath) {} - void sendMessage(UIMessage message, const char *value) override; -protected: Path gamePath_; }; -class PromptScreen : public UIDialogScreenWithGameBackground { +class PromptScreen : public UIBaseDialogScreen { public: - PromptScreen(const Path& gamePath, std::string_view message, std::string_view yesButtonText, std::string_view noButtonText, + PromptScreen(const Path &gamePath, std::string_view message, std::string_view yesButtonText, std::string_view noButtonText, std::function callback = &NoOpVoidBool); void CreateViews() override; @@ -156,7 +138,7 @@ private: AfterLogoScreen afterLogoScreen_; }; -class CreditsScreen : public UIDialogScreenWithBackground { +class CreditsScreen : public UIBaseDialogScreen { public: void update() override; diff --git a/UI/PauseScreen.cpp b/UI/PauseScreen.cpp index 1621db9da7..3f9f8fe809 100644 --- a/UI/PauseScreen.cpp +++ b/UI/PauseScreen.cpp @@ -328,7 +328,7 @@ void GamePauseScreen::update() { } GamePauseScreen::GamePauseScreen(const Path &filename, bool bootPending) - : UIDialogScreenWithGameBackground(filename), bootPending_(bootPending) { + : UIBaseDialogScreen(filename), bootPending_(bootPending) { // So we can tell if something blew up while on the pause screen. std::string assertStr = "PauseScreen: " + filename.GetFilename(); SetExtraAssertInfo(assertStr.c_str()); diff --git a/UI/PauseScreen.h b/UI/PauseScreen.h index 02da801069..c6b534a65b 100644 --- a/UI/PauseScreen.h +++ b/UI/PauseScreen.h @@ -26,7 +26,7 @@ #include "UI/MiscScreens.h" #include "UI/Screen.h" -class GamePauseScreen : public UIDialogScreenWithGameBackground { +class GamePauseScreen : public UIBaseDialogScreen { public: GamePauseScreen(const Path &filename, bool bootPending); ~GamePauseScreen(); diff --git a/UI/RemoteISOScreen.cpp b/UI/RemoteISOScreen.cpp index 0735ab70c4..17392d941c 100644 --- a/UI/RemoteISOScreen.cpp +++ b/UI/RemoteISOScreen.cpp @@ -270,7 +270,7 @@ static bool LoadGameList(const Path &url, std::vector &games) { return !games.empty(); } -RemoteISOScreen::RemoteISOScreen(const Path &filename) : TabbedUIDialogScreenWithGameBackground(filename) {} +RemoteISOScreen::RemoteISOScreen(const Path &filename) : UITabbedBaseDialogScreen(filename) {} void RemoteISOScreen::CreateTabs() { @@ -287,7 +287,7 @@ void RemoteISOScreen::CreateTabs() { } void RemoteISOScreen::update() { - TabbedUIDialogScreenWithGameBackground::update(); + UITabbedBaseDialogScreen::update(); frameCount_++; @@ -499,7 +499,7 @@ void RemoteISOConnectScreen::CreateViews() { void RemoteISOConnectScreen::update() { auto ri = GetI18NCategory(I18NCat::REMOTEISO); - UIDialogScreenWithBackground::update(); + UIBaseDialogScreen::update(); ScanStatus s = GetStatus(); switch (s) { diff --git a/UI/RemoteISOScreen.h b/UI/RemoteISOScreen.h index 401a6c96e9..ecf143aee9 100644 --- a/UI/RemoteISOScreen.h +++ b/UI/RemoteISOScreen.h @@ -26,7 +26,7 @@ #include "UI/MainScreen.h" #include "UI/TabbedDialogScreen.h" -class RemoteISOScreen : public TabbedUIDialogScreenWithGameBackground { +class RemoteISOScreen : public UITabbedBaseDialogScreen { public: RemoteISOScreen(const Path &filename); @@ -62,7 +62,7 @@ enum class ScanStatus { LOADED, }; -class RemoteISOConnectScreen : public UIDialogScreenWithBackground { +class RemoteISOConnectScreen : public UIBaseDialogScreen { public: RemoteISOConnectScreen(); ~RemoteISOConnectScreen(); diff --git a/UI/RetroAchievementScreens.cpp b/UI/RetroAchievementScreens.cpp index 061e044b0b..ea32beeb0c 100644 --- a/UI/RetroAchievementScreens.cpp +++ b/UI/RetroAchievementScreens.cpp @@ -177,7 +177,7 @@ RetroAchievementsLeaderboardScreen::~RetroAchievementsLeaderboardScreen() { } RetroAchievementsLeaderboardScreen::RetroAchievementsLeaderboardScreen(const Path &gamePath, int leaderboardID) - : TabbedUIDialogScreenWithGameBackground(gamePath), leaderboardID_(leaderboardID) { + : UITabbedBaseDialogScreen(gamePath), leaderboardID_(leaderboardID) { FetchEntries(); } @@ -253,7 +253,7 @@ void RetroAchievementsLeaderboardScreen::Poll() { } void RetroAchievementsLeaderboardScreen::update() { - TabbedUIDialogScreenWithGameBackground::update(); + UITabbedBaseDialogScreen::update(); Poll(); } @@ -279,7 +279,7 @@ void RetroAchievementsSettingsScreen::CreateTabs() { } void RetroAchievementsSettingsScreen::sendMessage(UIMessage message, const char *value) { - TabbedUIDialogScreenWithGameBackground::sendMessage(message, value); + UITabbedBaseDialogScreen::sendMessage(message, value); if (message == UIMessage::ACHIEVEMENT_LOGIN_STATE_CHANGE) { RecreateViews(); diff --git a/UI/RetroAchievementScreens.h b/UI/RetroAchievementScreens.h index 83db9bf811..1fb9224dce 100644 --- a/UI/RetroAchievementScreens.h +++ b/UI/RetroAchievementScreens.h @@ -13,9 +13,9 @@ #include "ext/rcheevos/include/rc_client.h" // Lists the achievements and leaderboards for one game. -class RetroAchievementsListScreen : public TabbedUIDialogScreenWithGameBackground { +class RetroAchievementsListScreen : public UITabbedBaseDialogScreen { public: - RetroAchievementsListScreen(const Path &gamePath) : TabbedUIDialogScreenWithGameBackground(gamePath) {} + RetroAchievementsListScreen(const Path &gamePath) : UITabbedBaseDialogScreen(gamePath) {} const char *tag() const override { return "RetroAchievementsListScreen"; } void CreateTabs() override; @@ -30,9 +30,9 @@ private: }; // Lets you manage your account, and shows some achievement stats and stuff. -class RetroAchievementsSettingsScreen : public TabbedUIDialogScreenWithGameBackground { +class RetroAchievementsSettingsScreen : public UITabbedBaseDialogScreen { public: - RetroAchievementsSettingsScreen(const Path &gamePath) : TabbedUIDialogScreenWithGameBackground(gamePath) {} + RetroAchievementsSettingsScreen(const Path &gamePath) : UITabbedBaseDialogScreen(gamePath) {} ~RetroAchievementsSettingsScreen(); const char *tag() const override { return "RetroAchievementsSettingsScreen"; } @@ -50,7 +50,7 @@ private: std::string password_; }; -class RetroAchievementsLeaderboardScreen : public TabbedUIDialogScreenWithGameBackground { +class RetroAchievementsLeaderboardScreen : public UITabbedBaseDialogScreen { public: RetroAchievementsLeaderboardScreen(const Path &gamePath, int leaderboardID); ~RetroAchievementsLeaderboardScreen(); diff --git a/UI/SavedataScreen.cpp b/UI/SavedataScreen.cpp index 0d6c62f6dc..d274f9dd5e 100644 --- a/UI/SavedataScreen.cpp +++ b/UI/SavedataScreen.cpp @@ -711,7 +711,7 @@ void SavedataScreen::dialogFinished(const Screen *dialog, DialogResult result) { } void SavedataScreen::sendMessage(UIMessage message, const char *value) { - UIDialogScreenWithGameBackground::sendMessage(message, value); + UIBaseDialogScreen::sendMessage(message, value); if (message == UIMessage::SAVEDATA_SEARCH) { EnsureTabs(); diff --git a/UI/SavedataScreen.h b/UI/SavedataScreen.h index c7912f722e..a0785df039 100644 --- a/UI/SavedataScreen.h +++ b/UI/SavedataScreen.h @@ -67,10 +67,10 @@ private: bool searchPending_ = false; }; -class SavedataScreen : public TabbedUIDialogScreenWithGameBackground { +class SavedataScreen : public UITabbedBaseDialogScreen { public: // gamePath can be empty, in that case this screen will show all savedata in the save directory. - SavedataScreen(const Path &gamePath) : TabbedUIDialogScreenWithGameBackground(gamePath) {} + SavedataScreen(const Path &gamePath) : UITabbedBaseDialogScreen(gamePath) {} ~SavedataScreen(); void dialogFinished(const Screen *dialog, DialogResult result) override; diff --git a/UI/Store.cpp b/UI/Store.cpp index 1eab2a69c3..fbc1c4dd73 100644 --- a/UI/Store.cpp +++ b/UI/Store.cpp @@ -436,7 +436,7 @@ StoreScreen::~StoreScreen() { // Handle async download tasks void StoreScreen::update() { - UIDialogScreenWithBackground::update(); + UIBaseDialogScreen::update(); g_DownloadManager.Update(); @@ -515,7 +515,7 @@ void StoreScreen::CreateViews() { // Top bar LinearLayout *topBar = root_->Add(new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, 64.0f))); - topBar->Add(new Choice(di->T("Back"), new LinearLayoutParams(WRAP_CONTENT, FILL_PARENT)))->OnClick.Handle(this, &UIScreen::OnBack); + topBar->Add(new Choice(ImageID("I_NAVIGATE_BACK"), new LinearLayoutParams(WRAP_CONTENT, FILL_PARENT)))->OnClick.Handle(this, &UIScreen::OnBack); titleText_ = new TextView(mm->T("PPSSPP Homebrew Store"), ALIGN_VCENTER, false, new LinearLayoutParams(WRAP_CONTENT, FILL_PARENT)); titleText_->SetTextColor(screenManager()->getUIContext()->GetTheme().itemDownStyle.fgColor); topBar->Add(titleText_); @@ -528,9 +528,7 @@ void StoreScreen::CreateViews() { content->Add(new TextView(loading_ ? std::string(st->T("Loading...")) : StringFromFormat("%s: %d", st->T_cstr("Connection Error"), resultCode_))); if (!loading_) { content->Add(new Button(di->T("Retry")))->OnClick.Handle(this, &StoreScreen::OnRetry); - } - content->Add(new Button(di->T("Back")))->OnClick.Handle(this, &UIScreen::OnBack); scrollItemView_ = nullptr; productPanel_ = nullptr; diff --git a/UI/Store.h b/UI/Store.h index 2b18d9de21..f971dd3a64 100644 --- a/UI/Store.h +++ b/UI/Store.h @@ -60,7 +60,7 @@ struct StoreEntry { u64 size; }; -class StoreScreen : public UIDialogScreenWithBackground { +class StoreScreen : public UIBaseDialogScreen { public: StoreScreen(); ~StoreScreen(); diff --git a/UI/SystemInfoScreen.cpp b/UI/SystemInfoScreen.cpp index 8b78f4245d..0360dc82cf 100644 --- a/UI/SystemInfoScreen.cpp +++ b/UI/SystemInfoScreen.cpp @@ -27,7 +27,7 @@ #include "android/jni/app-android.h" void SystemInfoScreen::update() { - TabbedUIDialogScreenWithGameBackground::update(); + UITabbedBaseDialogScreen::update(); g_OSD.NudgeSidebar(); } diff --git a/UI/SystemInfoScreen.h b/UI/SystemInfoScreen.h index 626614f8e4..079b8be3a0 100644 --- a/UI/SystemInfoScreen.h +++ b/UI/SystemInfoScreen.h @@ -7,9 +7,9 @@ #include "Common/UI/UIScreen.h" #include "UI/TabbedDialogScreen.h" -class SystemInfoScreen : public TabbedUIDialogScreenWithGameBackground { +class SystemInfoScreen : public UITabbedBaseDialogScreen { public: - SystemInfoScreen(const Path &filename) : TabbedUIDialogScreenWithGameBackground(filename) {} + SystemInfoScreen(const Path &filename) : UITabbedBaseDialogScreen(filename) {} const char *tag() const override { return "SystemInfo"; } diff --git a/UI/TabbedDialogScreen.cpp b/UI/TabbedDialogScreen.cpp index 414daeddd3..62a3d53cfe 100644 --- a/UI/TabbedDialogScreen.cpp +++ b/UI/TabbedDialogScreen.cpp @@ -7,7 +7,7 @@ #include "Common/UI/TabHolder.h" #include "UI/TabbedDialogScreen.h" -void TabbedUIDialogScreenWithGameBackground::AddTab(const char *tag, std::string_view title, std::function createCallback, TabFlags flags) { +void UITabbedBaseDialogScreen::AddTab(const char *tag, std::string_view title, std::function createCallback, TabFlags flags) { using namespace UI; tabHolder_->AddTabDeferred(title, [createCallback = std::move(createCallback), tag, flags]() -> UI::ViewGroup * { @@ -28,7 +28,7 @@ void TabbedUIDialogScreenWithGameBackground::AddTab(const char *tag, std::string }); } -void TabbedUIDialogScreenWithGameBackground::CreateViews() { +void UITabbedBaseDialogScreen::CreateViews() { PreCreateViews(); bool portrait = UsePortraitLayout() || ForceHorizontalTabs(); @@ -104,8 +104,8 @@ void TabbedUIDialogScreenWithGameBackground::CreateViews() { } } -void TabbedUIDialogScreenWithGameBackground::sendMessage(UIMessage message, const char *value) { - UIDialogScreenWithGameBackground::sendMessage(message, value); +void UITabbedBaseDialogScreen::sendMessage(UIMessage message, const char *value) { + UIBaseDialogScreen::sendMessage(message, value); if (message == UIMessage::GAMESETTINGS_SEARCH) { std::string filter = value ? value : ""; searchFilter_.resize(filter.size()); @@ -115,27 +115,27 @@ void TabbedUIDialogScreenWithGameBackground::sendMessage(UIMessage message, cons } } -void TabbedUIDialogScreenWithGameBackground::RecreateViews() { +void UITabbedBaseDialogScreen::RecreateViews() { oldSettingInfo_ = settingInfo_ ? settingInfo_->GetText() : "N/A"; UIScreen::RecreateViews(); } -void TabbedUIDialogScreenWithGameBackground::EnsureTabs() { +void UITabbedBaseDialogScreen::EnsureTabs() { _dbg_assert_(tabHolder_); if (tabHolder_) { tabHolder_->EnsureAllCreated(); } } -int TabbedUIDialogScreenWithGameBackground::GetCurrentTab() const { +int UITabbedBaseDialogScreen::GetCurrentTab() const { return tabHolder_->GetCurrentTab(); } -void TabbedUIDialogScreenWithGameBackground::SetCurrentTab(int tab) { +void UITabbedBaseDialogScreen::SetCurrentTab(int tab) { tabHolder_->SetCurrentTab(tab); } -void TabbedUIDialogScreenWithGameBackground::ApplySearchFilter() { +void UITabbedBaseDialogScreen::ApplySearchFilter() { using namespace UI; auto se = GetI18NCategory(I18NCat::SEARCH); diff --git a/UI/TabbedDialogScreen.h b/UI/TabbedDialogScreen.h index d191e8123c..de135f88bc 100644 --- a/UI/TabbedDialogScreen.h +++ b/UI/TabbedDialogScreen.h @@ -18,9 +18,9 @@ enum class TabFlags { }; ENUM_CLASS_BITOPS(TabFlags); -class TabbedUIDialogScreenWithGameBackground : public UIDialogScreenWithGameBackground { +class UITabbedBaseDialogScreen : public UIBaseDialogScreen { public: - TabbedUIDialogScreenWithGameBackground(const Path &gamePath) : UIDialogScreenWithGameBackground(gamePath) { + UITabbedBaseDialogScreen(const Path &gamePath) : UIBaseDialogScreen(gamePath) { ignoreBottomInset_ = true; } diff --git a/UI/TiltAnalogSettingsScreen.cpp b/UI/TiltAnalogSettingsScreen.cpp index 1931d8c433..a7247ee648 100644 --- a/UI/TiltAnalogSettingsScreen.cpp +++ b/UI/TiltAnalogSettingsScreen.cpp @@ -151,7 +151,7 @@ void TiltAnalogSettingsScreen::OnCalibrate(UI::EventParams &e) { } void TiltAnalogSettingsScreen::update() { - UIDialogScreenWithGameBackground::update(); + UIBaseDialogScreen::update(); if (tilt_) { tilt_->SetXY( Clamp(TiltEventProcessor::rawTiltAnalogX, -1.0f, 1.0f), diff --git a/UI/TiltAnalogSettingsScreen.h b/UI/TiltAnalogSettingsScreen.h index 62e7e782f7..f8e00d916b 100644 --- a/UI/TiltAnalogSettingsScreen.h +++ b/UI/TiltAnalogSettingsScreen.h @@ -24,9 +24,9 @@ class JoystickHistoryView; class GamepadView; -class TiltAnalogSettingsScreen : public UIDialogScreenWithGameBackground { +class TiltAnalogSettingsScreen : public UIBaseDialogScreen { public: - TiltAnalogSettingsScreen(const Path &gamePath) : UIDialogScreenWithGameBackground(gamePath) {} + TiltAnalogSettingsScreen(const Path &gamePath) : UIBaseDialogScreen(gamePath) {} void CreateViews() override; void update() override; diff --git a/UI/TouchControlLayoutScreen.cpp b/UI/TouchControlLayoutScreen.cpp index 67c0137ccf..c972b4c4d3 100644 --- a/UI/TouchControlLayoutScreen.cpp +++ b/UI/TouchControlLayoutScreen.cpp @@ -605,7 +605,7 @@ void TouchControlLayoutScreen::OnMode(UI::EventParams &e) { } void TouchControlLayoutScreen::update() { - UIDialogScreenWithGameBackground::update(); + UIBaseDialogScreen::update(); if (!layoutView_) { return; diff --git a/UI/TouchControlLayoutScreen.h b/UI/TouchControlLayoutScreen.h index 105463a69f..e10c7568b4 100644 --- a/UI/TouchControlLayoutScreen.h +++ b/UI/TouchControlLayoutScreen.h @@ -24,9 +24,9 @@ class ControlLayoutView; -class TouchControlLayoutScreen : public UIDialogScreenWithGameBackground { +class TouchControlLayoutScreen : public UIBaseDialogScreen { public: - TouchControlLayoutScreen(const Path &gamePath) : UIDialogScreenWithGameBackground(gamePath) {} + TouchControlLayoutScreen(const Path &gamePath) : UIBaseDialogScreen(gamePath) {} void CreateViews() override; void dialogFinished(const Screen *dialog, DialogResult result) override; diff --git a/UI/TouchControlVisibilityScreen.h b/UI/TouchControlVisibilityScreen.h index 3bb5199844..dca6aa635e 100644 --- a/UI/TouchControlVisibilityScreen.h +++ b/UI/TouchControlVisibilityScreen.h @@ -32,9 +32,9 @@ struct TouchButtonToggle { std::function handle; }; -class TouchControlVisibilityScreen : public TabbedUIDialogScreenWithGameBackground { +class TouchControlVisibilityScreen : public UITabbedBaseDialogScreen { public: - TouchControlVisibilityScreen(const Path &gamePath) : TabbedUIDialogScreenWithGameBackground(gamePath) {} + TouchControlVisibilityScreen(const Path &gamePath) : UITabbedBaseDialogScreen(gamePath) {} void CreateTabs() override; void onFinish(DialogResult result) override; @@ -49,9 +49,9 @@ private: bool nextToggleAll_ = true; }; -class RightAnalogMappingScreen : public UIDialogScreenWithGameBackground { +class RightAnalogMappingScreen : public UIBaseDialogScreen { public: - RightAnalogMappingScreen(const Path &gamePath) : UIDialogScreenWithGameBackground(gamePath) {} + RightAnalogMappingScreen(const Path &gamePath) : UIBaseDialogScreen(gamePath) {} void CreateViews() override; const char *tag() const override { return "RightAnalogMapping"; } diff --git a/UI/UploadScreen.h b/UI/UploadScreen.h index b5acafe555..161a574cbd 100644 --- a/UI/UploadScreen.h +++ b/UI/UploadScreen.h @@ -31,7 +31,7 @@ // Upload screen: Shows the user an ip address to go to in a web browser on the same network, // in order to upload game files to the current directory. -class UploadScreen : public UIDialogScreenWithBackground { +class UploadScreen : public UIBaseDialogScreen { public: UploadScreen(const Path &targetFolder); ~UploadScreen();