h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 19:04:06 +08:00
Code Issues Releases Wiki Activity

Merge pull request #23649 from peppy/keep-selection-buttons-on-screen

Browse Source 
Ensure editor selection buttons remain on screen when selection is near edge
This commit is contained in:
Dean Herbert 2023-05-26 20:51:45 +09:00 committed by GitHub
commit 725734bc03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
{ {
public const float BORDER_RADIUS = 3; public const float BORDER_RADIUS = 3;
private const float button_padding = 5;
public Func<float, bool> OnRotation; public Func<float, bool> OnRotation;
public Func<Vector2, Anchor, bool> OnScale; public Func<Vector2, Anchor, bool> OnScale;
public Func<Direction, bool, bool> OnFlip; public Func<Direction, bool, bool> OnFlip;
@ -182,6 +184,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
return base.OnKeyDown(e); return base.OnKeyDown(e);
} }
protected override void Update()
{
base.Update();
ensureButtonsOnScreen();
}
private void recreate() private void recreate()
{ {
if (LoadState < LoadState.Loading) if (LoadState < LoadState.Loading)
@ -234,11 +243,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
}, },
buttons = new FillFlowContainer buttons = new FillFlowContainer
{ {
Y = 20, AutoSizeAxes = Axes.X,
AutoSizeAxes = Axes.Both, Height = 30,
Direction = FillDirection.Horizontal, Direction = FillDirection.Horizontal,
Anchor = Anchor.BottomCentre, Margin = new MarginPadding(button_padding),
Origin = Anchor.Centre
} }
}; };
@ -352,5 +360,39 @@ namespace osu.Game.Screens.Edit.Compose.Components
if (activeOperations++ == 0) if (activeOperations++ == 0)
OperationStarted?.Invoke(); OperationStarted?.Invoke();
} }
private void ensureButtonsOnScreen()
{
buttons.Position = Vector2.Zero;
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 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 (topExcess + bottomExcess < buttons.Height + button_padding)
{
buttons.Anchor = Anchor.BottomCentre;
buttons.Origin = Anchor.BottomCentre;
}
else if (topExcess > bottomExcess)
{
buttons.Anchor = Anchor.TopCentre;
buttons.Origin = Anchor.BottomCentre;
}
else
{
buttons.Anchor = Anchor.BottomCentre;
buttons.Origin = Anchor.TopCentre;
}
buttons.X += ToLocalSpace(thisQuad.TopLeft - new Vector2(Math.Min(0, leftExcess)) + new Vector2(Math.Min(0, rightExcess))).X;
}
} }
} }