Achievements: Handle dynamically-sized leaderboard trackers

This commit is contained in:
Stenzek 2023-12-04 14:12:32 +10:00
parent 07fac1fb19
commit dc6bb357d4
No known key found for this signature in database
1 changed files with 1 additions and 3 deletions

View File

@ -96,7 +96,6 @@ struct LeaderboardTrackerIndicator
u32 tracker_id; u32 tracker_id;
std::string text; std::string text;
Common::Timer show_hide_time; Common::Timer show_hide_time;
u32 display_length;
bool active; bool active;
}; };
@ -1190,7 +1189,6 @@ void Achievements::HandleLeaderboardTrackerShowEvent(const rc_client_event_t* ev
LeaderboardTrackerIndicator indicator; LeaderboardTrackerIndicator indicator;
indicator.tracker_id = event->leaderboard_tracker->id; indicator.tracker_id = event->leaderboard_tracker->id;
indicator.text = event->leaderboard_tracker->display; indicator.text = event->leaderboard_tracker->display;
indicator.display_length = static_cast<u32>(std::strlen(event->leaderboard_tracker->display));
indicator.active = true; indicator.active = true;
s_active_leaderboard_trackers.push_back(std::move(indicator)); s_active_leaderboard_trackers.push_back(std::move(indicator));
} }
@ -1963,7 +1961,7 @@ void Achievements::DrawGameOverlays()
TinyString width_string; TinyString width_string;
width_string.append(ICON_FA_STOPWATCH); width_string.append(ICON_FA_STOPWATCH);
for (u32 i = 0; i < indicator.display_length; i++) for (u32 i = 0; i < indicator.text.length(); i++)
width_string.append('0'); width_string.append('0');
const ImVec2 size = ImGuiFullscreen::g_medium_font->CalcTextSizeA( const ImVec2 size = ImGuiFullscreen::g_medium_font->CalcTextSizeA(
ImGuiFullscreen::g_medium_font->FontSize, FLT_MAX, 0.0f, width_string.c_str(), width_string.end_ptr()); ImGuiFullscreen::g_medium_font->FontSize, FLT_MAX, 0.0f, width_string.c_str(), width_string.end_ptr());