From 9793172eba184e7512f77ebe9d2fdf682b339ede Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 7 Apr 2026 20:52:38 -0600 Subject: [PATCH] More UI refinements --- Core/RetroAchievements.cpp | 12 +++++++++--- Core/RetroAchievements.h | 2 +- UI/PauseScreen.cpp | 3 ++- UI/RetroAchievementScreens.cpp | 34 +++++++++++++++++++--------------- UI/RetroAchievementScreens.h | 4 +++- 5 files changed, 34 insertions(+), 21 deletions(-) diff --git a/Core/RetroAchievements.cpp b/Core/RetroAchievements.cpp index 5659876479..d0f6701183 100644 --- a/Core/RetroAchievements.cpp +++ b/Core/RetroAchievements.cpp @@ -934,11 +934,16 @@ Statistics GetStatistics() { return g_stats; } -std::string GetGameAchievementSummary() { +std::string GetGameAchievementSummary(uint32_t subsetId) { auto ac = GetI18NCategory(I18NCat::ACHIEVEMENTS); rc_client_user_game_summary_t summary; - rc_client_get_user_game_summary(g_rcClient, &summary); + + if (subsetId) { + rc_client_get_user_subset_summary(g_rcClient, subsetId, &summary); + } else { + rc_client_get_user_game_summary(g_rcClient, &summary); + } std::string summaryString; if (summary.num_core_achievements + summary.num_unofficial_achievements == 0) { @@ -991,7 +996,8 @@ void identify_and_load_callback(int result, const char *error_message, rc_client title += regionStr; title += ")"; } - g_OSD.Show(OSDType::MESSAGE_INFO, title, GetGameAchievementSummary(), gameInfo->badge_url, 5.0f); + // TODO: Detect current subset. + g_OSD.Show(OSDType::MESSAGE_INFO, title, GetGameAchievementSummary(0), gameInfo->badge_url, 5.0f); break; } case RC_NO_GAME_LOADED: diff --git a/Core/RetroAchievements.h b/Core/RetroAchievements.h index 23ba5f1013..158c5a322e 100644 --- a/Core/RetroAchievements.h +++ b/Core/RetroAchievements.h @@ -102,7 +102,7 @@ void UnloadGame(); // Call when leaving a game. Statistics GetStatistics(); -std::string GetGameAchievementSummary(); +std::string GetGameAchievementSummary(uint32_t subsetId); std::set GetActiveChallengeIDs(); diff --git a/UI/PauseScreen.cpp b/UI/PauseScreen.cpp index bad2142a99..79b1c55b58 100644 --- a/UI/PauseScreen.cpp +++ b/UI/PauseScreen.cpp @@ -502,7 +502,8 @@ void GamePauseScreen::CreateViews() { saveDataScrollItems->SetSpacing(5.0f); if (Achievements::IsActive()) { - saveDataScrollItems->Add(new GameAchievementSummaryView()); + // TODO: active subset? + saveDataScrollItems->Add(new GameAchievementSummaryView(0)); char buf[512]; size_t sz = Achievements::GetRichPresenceMessage(buf, sizeof(buf)); diff --git a/UI/RetroAchievementScreens.cpp b/UI/RetroAchievementScreens.cpp index cde0135ce4..f6e395039c 100644 --- a/UI/RetroAchievementScreens.cpp +++ b/UI/RetroAchievementScreens.cpp @@ -86,6 +86,8 @@ static uint32_t GetListFilter() { // Temporary. struct SubsetInfo { + u32 id; + bool isDefault; std::string title; std::vector buckets; }; @@ -101,7 +103,11 @@ void CreateAchievementsTab(UI::ViewGroup *achievements, const SubsetInfo &subset rc_client_achievement_list_t *list = rc_client_create_achievement_list(Achievements::GetClient(), GetListFilter(), RC_CLIENT_ACHIEVEMENT_LIST_GROUPING_PROGRESS); - achievements->Add(new GameAchievementSummaryView()); + if (!subset.isDefault) { + achievements->Add(new Spacer(8.0f)); + achievements->Add(new TextView(subset.title))->SetTextSize(UI::TextSize::Big); + } + achievements->Add(new GameAchievementSummaryView(subset.id)); if (Achievements::EncoreModeActive()) { achievements->Add(new NoticeView(NoticeLevel::WARN, ac->T("In Encore mode - unlock state may not be accurate"), "")); @@ -114,12 +120,7 @@ void CreateAchievementsTab(UI::ViewGroup *achievements, const SubsetInfo &subset } // Populate the subset list as we go. const rc_client_subset_t *subset = rc_client_get_subset_info(Achievements::GetClient(), bucket.subset_id); - std::string title; - if (!subset || equals(subset->title, client_game->title)) { - title = StringFromFormat("%s (%d)", ac->T_cstr(AchievementBucketTitle(bucket.bucket_type)), bucket.num_achievements); - } else { - title = StringFromFormat("%s - %s (%d)", subset->title, ac->T_cstr(AchievementBucketTitle(bucket.bucket_type)), bucket.num_achievements); - } + std::string title = StringFromFormat("%s (%d)", ac->T_cstr(AchievementBucketTitle(bucket.bucket_type)), bucket.num_achievements); CollapsibleSection *section = achievements->Add(new CollapsibleSection(title)); section->SetSpacing(2.0f); @@ -137,7 +138,8 @@ void RetroAchievementsListScreen::CreateLeaderboardsTab(UI::ViewGroup *viewGroup using namespace UI; - viewGroup->Add(new GameAchievementSummaryView()); + // TODO: subset? + viewGroup->Add(new GameAchievementSummaryView(0)); viewGroup->Add(new ItemHeader(ac->T("Leaderboards"))); @@ -168,7 +170,6 @@ void RetroAchievementsListScreen::CreateStatisticsTab(UI::ViewGroup *viewGroup) viewGroup->Add(new InfoItem(ac->T("Bad memory accesses"), StringFromFormat("%d", stats.badMemoryAccessCount))); } - void RetroAchievementsListScreen::CreateTabs() { auto ac = GetI18NCategory(I18NCat::ACHIEVEMENTS); @@ -188,6 +189,7 @@ void RetroAchievementsListScreen::CreateTabs() { if (bucketsBySubset.find(bucket.subset_id) == bucketsBySubset.end()) { bucketsBySubset[bucket.subset_id] = SubsetInfo(); + bucketsBySubset[bucket.subset_id].id = bucket.subset_id; } // Populate the subset list as we go. @@ -195,8 +197,10 @@ void RetroAchievementsListScreen::CreateTabs() { if (bucketsBySubset[bucket.subset_id].title.empty()) { if (!subset || equals(subset->title, client_game->title)) { bucketsBySubset[bucket.subset_id].title = ac->T("Achievements"); + bucketsBySubset[bucket.subset_id].isDefault = true; } else { bucketsBySubset[bucket.subset_id].title = subset->title; + bucketsBySubset[bucket.subset_id].isDefault = false; } } } @@ -620,8 +624,8 @@ void RenderAchievement(UIContext &dc, const rc_client_achievement_t *achievement dc.PopScissor(); } -static void MeasureGameAchievementSummary(const UIContext &dc, std::string_view title, float maxWidth, float *w, float *h) { - std::string description = Achievements::GetGameAchievementSummary(); +static void MeasureGameAchievementSummary(const UIContext &dc, std::string_view title, float maxWidth, float *w, float *h, uint32_t subsetId) { + std::string description = Achievements::GetGameAchievementSummary(subsetId); float iconSpace = 64.0f; float availableWidth = maxWidth - iconSpace - 5.0f - 5.0f - 8.0f; @@ -633,7 +637,7 @@ static void MeasureGameAchievementSummary(const UIContext &dc, std::string_view *w += 8.0f; } -static void RenderGameAchievementSummary(UIContext &dc, const Bounds &bounds, float alpha, const rc_client_game_t *gameInfo) { +static void RenderGameAchievementSummary(UIContext &dc, const Bounds &bounds, float alpha, const rc_client_game_t *gameInfo, uint32_t subsetId) { using namespace UI; UI::Drawable background = dc.GetTheme().itemStyle.background; @@ -651,7 +655,7 @@ static void RenderGameAchievementSummary(UIContext &dc, const Bounds &bounds, fl dc.DrawTextRect(gameInfo->title, bounds.Inset(iconSpace + 5.0f, 2.0f, 5.0f, 5.0f), fgColor, ALIGN_TOPLEFT | FLAG_ELLIPSIZE_TEXT); - std::string description = Achievements::GetGameAchievementSummary(); + std::string description = Achievements::GetGameAchievementSummary(subsetId); dc.SetFontStyle(dc.GetTheme().uiFontSmall); dc.DrawTextRect(description, bounds.Inset(iconSpace + 5.0f, 38.0f, 5.0f, 5.0f), fgColor, ALIGN_TOPLEFT | FLAG_WRAP_TEXT); @@ -802,7 +806,7 @@ void AchievementView::ClickInternal() { void GameAchievementSummaryView::Draw(UIContext &dc) { const rc_client_game_t *client_game = rc_client_get_game_info(Achievements::GetClient()); if (client_game) { - RenderGameAchievementSummary(dc, bounds_, 1.0f, client_game); + RenderGameAchievementSummary(dc, bounds_, 1.0f, client_game, subsetId_); } } @@ -819,7 +823,7 @@ void GameAchievementSummaryView::GetContentDimensionsBySpec(const UIContext &dc, layoutWidth = horiz.size; } ApplyBoundBySpec(layoutWidth, horiz); - MeasureGameAchievementSummary(dc, client_game->title, layoutWidth, &w, &h); + MeasureGameAchievementSummary(dc, client_game->title, layoutWidth, &w, &h, subsetId_); } void LeaderboardSummaryView::Draw(UIContext &dc) { diff --git a/UI/RetroAchievementScreens.h b/UI/RetroAchievementScreens.h index 3e77059eb6..86070d740e 100644 --- a/UI/RetroAchievementScreens.h +++ b/UI/RetroAchievementScreens.h @@ -106,12 +106,14 @@ private: class GameAchievementSummaryView : public UI::Item { public: - GameAchievementSummaryView(UI::LayoutParams *layoutParams = nullptr) : UI::Item(layoutParams) { + GameAchievementSummaryView(u32 subsetId, UI::LayoutParams *layoutParams = nullptr) : UI::Item(layoutParams), subsetId_(subsetId) { layoutParams_->height = UI::WRAP_CONTENT; // Override the standard Item fixed height. } void Draw(UIContext &dc) override; void GetContentDimensionsBySpec(const UIContext &dc, UI::MeasureSpec horiz, UI::MeasureSpec vert, float &w, float &h) const override; +private: + uint32_t subsetId_; }; class LeaderboardSummaryView : public UI::ClickableItem {