Mirror/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 14:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor the version reminder bar to make it reusable

Browse Source
This commit is contained in:
Henrik Rydgård committed 2026-09-22 09:48:18 -06:00
1 parent b366e8a6d0
commit 8c6ec65b2d
1 file changed
+26 -15
Download Patch File Download Diff File Expand all files Collapse all files
UI/MainScreen.cpp
+26 -15
View File
@@ -506,28 +506,39 @@ void MainScreen::CreateViews() {
root_->SetTag("mainroot"); root_->SetTag("mainroot");
if (!g_Config.sUpgradeMessage.empty()) { const UI::Drawable dismissableBackground = screenManager()->getUIContext()->GetTheme().itemDownStyle.background;
auto di = GetI18NCategory(I18NCat::DIALOG);
auto CreateDismissableBar = [this, vertical, dismissableBackground](std::string_view message, std::string_view action, std::function<void()> onDismiss) {
Margins margins(0, 0); Margins margins(0, 0);
UI::LinearLayout *upgradeBar = new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT, margins)); UI::LinearLayout *bar = new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT, margins));
UI::Margins textMargins(10, 5); UI::Margins textMargins(10, 5);
UI::Margins buttonMargins(5, 0); UI::Margins buttonMargins(5, 0);
UI::Drawable solid(0xFFbd9939); UI::Drawable solid(dismissableBackground);
upgradeBar->SetSpacing(5.0f); bar->SetSpacing(5.0f);
upgradeBar->SetBG(solid); bar->SetBG(solid);
std::string upgradeMessage(di->T("New version of PPSSPP available"));
if (!vertical) { bar->Add(new TextView(message, FLAG_WRAP_TEXT, false, new LinearLayoutParams(1.0f, UI::Gravity::G_VCENTER, textMargins)));
// The version only really fits in the horizontal layout. if (!action.empty()) {
upgradeMessage += ": " + g_Config.sUpgradeVersion; bar->Add(new Choice(action, new LinearLayoutParams(0.0f, UI::Gravity::G_VCENTER, buttonMargins)))->OnClick.Handle(this, &MainScreen::OnDownloadUpgrade);
} }
upgradeBar->Add(new TextView(upgradeMessage, new LinearLayoutParams(1.0f, UI::Gravity::G_VCENTER, textMargins)));
upgradeBar->Add(new Choice(di->T("Download"), new LinearLayoutParams(buttonMargins)))->OnClick.Handle(this, &MainScreen::OnDownloadUpgrade); Choice *dismiss = bar->Add(new Choice("", ImageID("I_CROSS"), new LinearLayoutParams(0.0f, UI::Gravity::G_VCENTER, buttonMargins)));
Choice *dismiss = upgradeBar->Add(new Choice("", ImageID("I_CROSS"), new LinearLayoutParams(buttonMargins))); dismiss->OnClick.Add([this, onDismiss](UI::EventParams &e) {
dismiss->OnClick.Add([this](UI::EventParams &e) { onDismiss();
RecreateViews();
});
return bar;
};
if (!g_Config.sUpgradeMessage.empty()) {
auto di = GetI18NCategory(I18NCat::DIALOG);
std::string upgradeMessage(di->T("New version of PPSSPP available"));
// The version only really fits in the horizontal layout.
upgradeMessage += ": " + g_Config.sUpgradeVersion;
UI::LinearLayout *upgradeBar = CreateDismissableBar(upgradeMessage, di->T("Download"), [this]() {
g_Config.DismissUpgrade(); g_Config.DismissUpgrade();
g_Config.Save("dismissupgrade"); g_Config.Save("dismissupgrade");
RecreateViews();
}); });
// Slip in at the top. // Slip in at the top.