mirror of
https://github.com/ppy/osu.git
synced 2025-01-15 08:12:56 +08:00
Merge pull request #12429 from EVAST9919/editor-fix
Simplify ExtendableCircle even more
This commit is contained in:
commit
6bfde9c1cb
@ -345,7 +345,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public class ExtendableCircle : CompositeDrawable
|
public class ExtendableCircle : CompositeDrawable
|
||||||
{
|
{
|
||||||
private readonly CircularContainer content;
|
private readonly Circle content;
|
||||||
|
|
||||||
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => content.ReceivePositionalInputAt(screenSpacePos);
|
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => content.ReceivePositionalInputAt(screenSpacePos);
|
||||||
|
|
||||||
@ -354,19 +354,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
|
|||||||
public ExtendableCircle()
|
public ExtendableCircle()
|
||||||
{
|
{
|
||||||
Padding = new MarginPadding { Horizontal = -circle_size / 2f };
|
Padding = new MarginPadding { Horizontal = -circle_size / 2f };
|
||||||
InternalChild = content = new CircularContainer
|
InternalChild = content = new Circle
|
||||||
{
|
{
|
||||||
RelativeSizeAxes = Axes.Both,
|
RelativeSizeAxes = Axes.Both,
|
||||||
Masking = true,
|
|
||||||
EdgeEffect = new EdgeEffectParameters
|
EdgeEffect = new EdgeEffectParameters
|
||||||
{
|
{
|
||||||
Type = EdgeEffectType.Shadow,
|
Type = EdgeEffectType.Shadow,
|
||||||
Radius = 5,
|
Radius = 5,
|
||||||
Colour = Color4.Black.Opacity(0.4f)
|
Colour = Color4.Black.Opacity(0.4f)
|
||||||
},
|
|
||||||
Child = new Box
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.Both
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user