RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-05 13:50:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12917 from frenzibyte/fix-hud-logic-oversight

Browse Source 
Fix HUD overlay positioning logic not accounting components properly
This commit is contained in:
Dean Herbert 2021-05-24 12:43:03 +09:00 committed by GitHub
commit babe24ff5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Screens/Play/HUDOverlay.cs
View File

@ -176,10 +176,7 @@ namespace osu.Game.Screens.Play
foreach (var element in mainComponents.Components.Cast<Drawable>())
{
// for now align top-right components with the bottom-edge of the lowest top-anchored hud element.
if (!element.RelativeSizeAxes.HasFlagFast(Axes.X))
continue;
if (element.Anchor.HasFlagFast(Anchor.TopRight))
if (element.Anchor.HasFlagFast(Anchor.TopRight) || (element.Anchor.HasFlagFast(Anchor.y0) && element.RelativeSizeAxes == Axes.X))
{
// health bars are excluded for the sake of hacky legacy skins which extend the health bar to take up the full screen area.
if (element is LegacyHealthDisplay)
@ -189,7 +186,8 @@ namespace osu.Game.Screens.Play
if (lowestTopScreenSpace == null || bottomRight.Y > lowestTopScreenSpace.Value.Y)
lowestTopScreenSpace = bottomRight;
}
else if (element.Anchor.HasFlagFast(Anchor.y2))
// and align bottom-right components with the top-edge of the highest bottom-anchored hud element.
else if (element.Anchor.HasFlagFast(Anchor.BottomRight) || (element.Anchor.HasFlagFast(Anchor.y2) && element.RelativeSizeAxes == Axes.X))
{
var topLeft = element.ScreenSpaceDrawQuad.TopLeft;
if (highestBottomScreenSpace == null || topLeft.Y < highestBottomScreenSpace.Value.Y)