From c33b4dc294bafa0310fc156bfcd73c85ccfb754d Mon Sep 17 00:00:00 2001 From: Hyper <34012267+hyperbx@users.noreply.github.com> Date: Thu, 20 Feb 2025 19:41:51 +0000 Subject: [PATCH] button_guide: fix LB/RB prompt clipping 4:3 aspect ratio --- UnleashedRecomp/ui/button_guide.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/UnleashedRecomp/ui/button_guide.cpp b/UnleashedRecomp/ui/button_guide.cpp index 89a1a6b1..d926d14d 100644 --- a/UnleashedRecomp/ui/button_guide.cpp +++ b/UnleashedRecomp/ui/button_guide.cpp @@ -157,19 +157,19 @@ static void DrawGuide(float* offset, ImVec2 regionMin, ImVec2 regionMax, EButton { auto iconMarginX = Scale(16); - iconMin = alignment == EButtonAlignment::Left - ? ImVec2(/* X */ regionMin.x + *offset - maxTextWidth + iconMarginX, /* Y */ iconMin.y) - : ImVec2(/* X */ regionMax.x - *offset - maxTextWidth + iconMarginX - iconWidth, /* Y */ iconMin.y); + iconMin.x = alignment == EButtonAlignment::Left + ? regionMin.x + *offset - maxTextWidth + (iconWidth / 2) + : regionMax.x - *offset - maxTextWidth - (iconWidth / 2) - iconMarginX; - iconMax = ImVec2(iconMin.x + iconWidth, iconMax.y); + iconMax.x = iconMin.x + iconWidth; // Left button. auto btnIcon = GetButtonIcon(icon == EButtonIcon::LBRB ? EButtonIcon::LB : EButtonIcon::LT); drawList->AddImage(std::get<1>(btnIcon), iconMin, iconMax, GET_UV_COORDS(std::get<0>(btnIcon))); auto dualIconMin = alignment == EButtonAlignment::Left - ? ImVec2(/* X */ regionMin.x + *offset + maxTextWidth - iconMarginX, /* Y */ iconMin.y) - : ImVec2(/* X */ regionMax.x - *offset + maxTextWidth - iconMarginX - iconWidth, /* Y */ iconMin.y); + ? ImVec2(iconMax.x + maxTextWidth + iconMarginX, iconMin.y) + : ImVec2(regionMax.x - *offset + maxTextWidth - iconWidth, iconMin.y); auto dualIconMax = ImVec2(dualIconMin.x + iconWidth, iconMax.y);