From 60f12e77fae450ee232da00f6615e1f60d2915cf Mon Sep 17 00:00:00 2001 From: Stenzek Date: Thu, 18 Apr 2024 20:09:56 +1000 Subject: [PATCH] Achievements: Fix fullscreen window height --- src/core/achievements.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/core/achievements.cpp b/src/core/achievements.cpp index b850b489a..2d30f7e11 100644 --- a/src/core/achievements.cpp +++ b/src/core/achievements.cpp @@ -2286,9 +2286,10 @@ void Achievements::DrawAchievementsWindow() ImGui::SetNextWindowBgAlpha(alpha); - if (ImGuiFullscreen::BeginFullscreenWindow(ImVec2(0.0f, heading_height), - ImVec2(display_size.x, display_size.y - heading_height), "achievements", - background, 0.0f, 0.0f, 0)) + if (ImGuiFullscreen::BeginFullscreenWindow( + ImVec2(0.0f, heading_height), + ImVec2(display_size.x, display_size.y - heading_height - LayoutScale(ImGuiFullscreen::LAYOUT_FOOTER_HEIGHT)), + "achievements", background, 0.0f, 0.0f, 0)) { static bool buckets_collapsed[NUM_RC_CLIENT_ACHIEVEMENT_BUCKETS] = {}; static const char* bucket_names[NUM_RC_CLIENT_ACHIEVEMENT_BUCKETS] = { @@ -2750,9 +2751,10 @@ void Achievements::DrawLeaderboardsWindow() if (!is_leaderboard_open) { - if (ImGuiFullscreen::BeginFullscreenWindow(ImVec2(0.0f, heading_height), - ImVec2(display_size.x, display_size.y - heading_height), "leaderboards", - background, 0.0f, 0.0f, 0)) + if (ImGuiFullscreen::BeginFullscreenWindow( + ImVec2(0.0f, heading_height), + ImVec2(display_size.x, display_size.y - heading_height - LayoutScale(ImGuiFullscreen::LAYOUT_FOOTER_HEIGHT)), + "leaderboards", background, 0.0f, 0.0f, 0)) { ImGuiFullscreen::BeginMenuButtons(); @@ -2769,9 +2771,10 @@ void Achievements::DrawLeaderboardsWindow() } else { - if (ImGuiFullscreen::BeginFullscreenWindow(ImVec2(0.0f, heading_height), - ImVec2(display_size.x, display_size.y - heading_height), "leaderboard", - background, 0.0f, 0.0f, 0)) + if (ImGuiFullscreen::BeginFullscreenWindow( + ImVec2(0.0f, heading_height), + ImVec2(display_size.x, display_size.y - heading_height - LayoutScale(ImGuiFullscreen::LAYOUT_FOOTER_HEIGHT)), + "leaderboard", background, 0.0f, 0.0f, 0)) { ImGuiFullscreen::BeginMenuButtons();