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

Merge branch 'master' into feature_openxr_quest

Browse source
This commit is contained in:
Lubos 2022-07-26 17:22:04 +02:00
commit c543c8fd52
117 changed files with 1539 additions and 985 deletions
Download patch file Download diff file Expand all files Collapse all files

22
UI/MainScreen.cpp
View file

@ -322,7 +322,17 @@ void GameButton::Draw(UIContext &dc) {
dc.Draw()->Flush();
dc.RebindTexture();
dc.SetFontStyle(dc.theme->uiFont);
if (!gridStyle_) {
if (gridStyle_ && ginfo->fileType == IdentifiedFileType::PPSSPP_GE_DUMP) {
// Super simple drawing for ge dumps.
dc.PushScissor(bounds_);
const std::string currentTitle = ginfo->GetTitle();
dc.SetFontScale(0.6f, 0.6f);
dc.DrawText(title_.c_str(), bounds_.x + 4.0f, bounds_.centerY(), style.fgColor, ALIGN_VCENTER | ALIGN_LEFT);
dc.SetFontScale(1.0f, 1.0f);
title_ = currentTitle;
dc.Draw()->Flush();
dc.PopScissor();
} else if (!gridStyle_) {
float tw, th;
dc.Draw()->Flush();
dc.PushScissor(bounds_);
@ -587,7 +597,7 @@ bool GameBrowser::DisplayTopBar() {
bool GameBrowser::HasSpecialFiles(std::vector<Path> &filenames) {
if (path_.GetPath().ToString() == "!RECENT") {
filenames.clear();
for (auto &str : g_Config.recentIsos) {
for (auto &str : g_Config.RecentIsos()) {
filenames.push_back(Path(str));
}
return true;
@ -986,7 +996,7 @@ void MainScreen::CreateViews() {
System_GetPermissionStatus(SYSTEM_PERMISSION_STORAGE) == PERMISSION_STATUS_GRANTED;
bool storageIsTemporary = IsTempPath(GetSysDirectory(DIRECTORY_SAVEDATA)) && !confirmedTemporary_;
if (showRecent && !hasStorageAccess) {
showRecent = !g_Config.recentIsos.empty();
showRecent = g_Config.HasRecentIsos();
}
if (showRecent) {
@ -1036,7 +1046,7 @@ void MainScreen::CreateViews() {
tabAllGames->OnHighlight.Handle(this, &MainScreen::OnGameHighlight);
tabHomebrew->OnHighlight.Handle(this, &MainScreen::OnGameHighlight);
if (g_Config.recentIsos.size() > 0) {
if (g_Config.HasRecentIsos()) {
tabHolder_->SetCurrentTab(0, true);
} else if (g_Config.iMaxRecent > 0) {
tabHolder_->SetCurrentTab(1, true);
@ -1494,7 +1504,7 @@ void UmdReplaceScreen::CreateViews() {
rightColumnItems->Add(new Choice(di->T("Cancel")))->OnClick.Handle(this, &UmdReplaceScreen::OnCancel);
rightColumnItems->Add(new Choice(mm->T("Game Settings")))->OnClick.Handle(this, &UmdReplaceScreen::OnGameSettings);
if (g_Config.recentIsos.size() > 0) {
if (g_Config.HasRecentIsos()) {
leftColumn->SetCurrentTab(0, true);
} else if (g_Config.iMaxRecent > 0) {
leftColumn->SetCurrentTab(1, true);
@ -1573,7 +1583,7 @@ UI::EventReturn GridSettingsScreen::GridMinusClick(UI::EventParams &e) {
}
UI::EventReturn GridSettingsScreen::OnRecentClearClick(UI::EventParams &e) {
g_Config.recentIsos.clear();
g_Config.ClearRecentIsos();
OnRecentChanged.Trigger(e);
return UI::EVENT_DONE;
}