diff --git a/UnleashedRecomp/patches/aspect_ratio_patches.cpp b/UnleashedRecomp/patches/aspect_ratio_patches.cpp index d0823820..07893db2 100644 --- a/UnleashedRecomp/patches/aspect_ratio_patches.cpp +++ b/UnleashedRecomp/patches/aspect_ratio_patches.cpp @@ -1019,8 +1019,17 @@ static double ComputeObjGetItemX(uint32_t type) x *= g_aspectRatioScale; - if (type != 47) - x += g_aspectRatioOffsetX * 2.0 + (1280.0 * (1.0 - g_aspectRatioScale)); + double scaleOffset = (1280.0 * (1.0 - g_aspectRatioScale)); + + if (Config::UIScaleMode == EUIScaleMode::Edge) + { + if (type != 47) // Medal + x += g_aspectRatioOffsetX * 2.0 + scaleOffset; + } + else if (Config::UIScaleMode == EUIScaleMode::Centre) + { + x += g_aspectRatioOffsetX + scaleOffset; + } auto backBuffer = Video::GetBackBuffer(); return (x - (0.5 * backBuffer->width)) / (0.5 * backBuffer->height) * OBJ_GET_ITEM_TANGENT; diff --git a/UnleashedRecomp/ui/options_menu.cpp b/UnleashedRecomp/ui/options_menu.cpp index e79247e8..10010020 100644 --- a/UnleashedRecomp/ui/options_menu.cpp +++ b/UnleashedRecomp/ui/options_menu.cpp @@ -157,12 +157,18 @@ static void DrawScanlineBars() SetShaderModifier(IMGUI_SHADER_MODIFIER_NONE); + float optionsX; + if (g_aspectRatio >= WIDE_ASPECT_RATIO) + optionsX = g_aspectRatioOffsetX; + else + optionsX = (1.0f - g_narrowOffsetScale) * -20.0f; + // Options text DrawTextWithOutline ( g_dfsogeistdFont, Scale(48.0f), - { Scale((1.0f - g_narrowOffsetScale) * -20.0f + 122.0f), Scale(56.0f) }, + { Scale(optionsX + 122.0f), Scale(56.0f) }, IM_COL32(255, 190, 33, 255), Localise("Options_Header_Name").c_str(), 4,