RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-02-09 14:47:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use yet another solution leveraging padding

Browse Source
This commit is contained in:
Bartłomiej Dach 2020-12-18 23:45:42 +01:00
parent 122250f454
commit f1878eff63
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,6 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System; using System;
using System.Collections.Generic;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
@ -93,6 +92,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
} }
} }
private Container dragHandles;
private FillFlowContainer buttons; private FillFlowContainer buttons;
public const float BORDER_RADIUS = 3; public const float BORDER_RADIUS = 3;
@ -152,6 +152,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
}, },
} }
}, },
dragHandles = new Container
{
RelativeSizeAxes = Axes.Both,
// ensures that the centres of all drag handles line up with the middle of the selection box border.
Padding = new MarginPadding(BORDER_RADIUS / 2)
},
buttons = new FillFlowContainer buttons = new FillFlowContainer
{ {
Y = 20, Y = 20,
@ -233,30 +239,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
}); });
} }
private void addDragHandle(Anchor anchor) => AddInternal(new SelectionBoxDragHandle private void addDragHandle(Anchor anchor) => dragHandles.Add(new SelectionBoxDragHandle
{ {
Anchor = anchor, Anchor = anchor,
X = dragCircleAdjustments[anchor].X,
Y = dragCircleAdjustments[anchor].Y,
HandleDrag = e => OnScale?.Invoke(e.Delta, anchor), HandleDrag = e => OnScale?.Invoke(e.Delta, anchor),
OperationStarted = operationStarted, OperationStarted = operationStarted,
OperationEnded = operationEnded OperationEnded = operationEnded
}); });
/// <summary>
/// Adjust Drag circle to be centered on the center of the border instead of on the edge.
/// </summary>
private Dictionary<Anchor, Vector2> dragCircleAdjustments = new Dictionary<Anchor, Vector2>(){
{Anchor.TopLeft, new Vector2(BORDER_RADIUS / 2)},
{Anchor.CentreLeft, new Vector2(BORDER_RADIUS / 2, 0)},
{Anchor.BottomLeft, new Vector2(BORDER_RADIUS / 2, -BORDER_RADIUS / 2)},
{Anchor.TopCentre, new Vector2(0, BORDER_RADIUS / 2)},
{Anchor.BottomCentre, new Vector2(0, -BORDER_RADIUS / 2)},
{Anchor.TopRight, new Vector2(-BORDER_RADIUS / 2, BORDER_RADIUS / 2)},
{Anchor.CentreRight, new Vector2(-BORDER_RADIUS / 2, 0)},
{Anchor.BottomRight, new Vector2(-BORDER_RADIUS / 2)}
};
private int activeOperations; private int activeOperations;
private float convertDragEventToAngleOfRotation(DragEvent e) private float convertDragEventToAngleOfRotation(DragEvent e)