h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 15:07:44 +08:00
Code Issues Releases Wiki Activity

Use alternative layouting implementation

Browse Source
This commit is contained in:
Bartłomiej Dach 2023-05-25 16:17:44 +02:00
parent 3b9e1e8a94
commit beeca5a8dd
No known key found for this signature in database
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
View File

@ -247,8 +247,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
Height = 30,
Direction = FillDirection.Horizontal,
Margin = new MarginPadding(button_padding),
Anchor = Anchor.BottomCentre,
Origin = Anchor.TopCentre
}
};
@ -367,24 +365,30 @@ namespace osu.Game.Screens.Edit.Compose.Components
{
buttons.Position = Vector2.Zero;
var buttonsQuad = buttons.ScreenSpaceDrawQuad;
var thisQuad = ScreenSpaceDrawQuad;
// Shrink the parent quad to give a bit of padding so the buttons don't stick *right* on the border.
// AABBFloat assumes no rotation. one would hope the whole editor is not being rotated.
var parentQuad = Parent.ScreenSpaceDrawQuad.AABBFloat.Shrink(ToLocalSpace(thisQuad.TopLeft + new Vector2(button_padding * 2)));
float leftExcess = buttonsQuad.TopLeft.X - parentQuad.TopLeft.X;
float rightExcess = parentQuad.TopRight.X - buttonsQuad.TopRight.X;
float bottomExcess = thisQuad.BottomLeft.Y + buttonsQuad.Height - parentQuad.BottomLeft.Y;
float topExcess = thisQuad.TopLeft.Y - parentQuad.TopLeft.Y;
float bottomExcess = parentQuad.BottomLeft.Y - thisQuad.BottomLeft.Y;
float leftExcess = thisQuad.TopLeft.X - parentQuad.TopLeft.X;
float rightExcess = parentQuad.TopRight.X - thisQuad.TopRight.X;
if (leftExcess < 0)
buttons.X += ToLocalSpace(thisQuad.TopLeft - new Vector2(leftExcess)).X;
else if (rightExcess < 0)
buttons.X -= ToLocalSpace(thisQuad.TopLeft - new Vector2(rightExcess)).X;
if (topExcess > bottomExcess)
{
buttons.Anchor = Anchor.TopCentre;
buttons.Origin = Anchor.BottomCentre;
}
else
{
buttons.Anchor = Anchor.BottomCentre;
buttons.Origin = Anchor.TopCentre;
}
if (bottomExcess > 0)
buttons.Y += ToLocalSpace(thisQuad.TopLeft - new Vector2(bottomExcess)).X;
if (leftExcess < 0) buttons.X += ToLocalSpace(thisQuad.TopLeft - new Vector2(leftExcess)).X;
if (rightExcess < 0) buttons.X += ToLocalSpace(thisQuad.TopLeft + new Vector2(rightExcess)).X;
}
}
}