h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 20:53:00 +08:00
Code Issues Releases Wiki Activity

Add mouse click support and increase area to full column height

Browse Source
This commit is contained in:
Dean Herbert 2022-01-31 16:36:56 +09:00
parent a84fd2e20c
commit cc7fb0e559
1 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
osu.Game.Rulesets.Mania/UI/Column.cs
View File

@ -28,7 +28,6 @@ namespace osu.Game.Rulesets.Mania.UI
{ {
public const float COLUMN_WIDTH = 80; public const float COLUMN_WIDTH = 80;
public const float SPECIAL_COLUMN_WIDTH = 70; public const float SPECIAL_COLUMN_WIDTH = 70;
public const float TOUCH_AREA_HEIGHT = 100;
/// <summary> /// <summary>
/// The index of this column as part of the whole playfield. /// The index of this column as part of the whole playfield.
@ -45,37 +44,6 @@ namespace osu.Game.Rulesets.Mania.UI
private readonly GameplaySampleTriggerSource sampleTriggerSource; private readonly GameplaySampleTriggerSource sampleTriggerSource;
public class ColumnTouchInputArea : Drawable
{
public ColumnTouchInputArea()
{
RelativeSizeAxes = Axes.X;
Anchor = Anchor.BottomCentre;
Origin = Anchor.BottomCentre;
Height = TOUCH_AREA_HEIGHT;
}
private Column column => (Column)Parent;
protected override void LoadComplete()
{
keyBindingContainer = (ManiaInputManager.RulesetKeyBindingContainer)((ManiaInputManager)GetContainingInputManager()).KeyBindingContainer;
}
private ManiaInputManager.RulesetKeyBindingContainer keyBindingContainer { get; set; }
protected override bool OnTouchDown(TouchDownEvent e)
{
keyBindingContainer.TriggerPressed(column.Action.Value);
return false;
}
protected override void OnTouchUp(TouchUpEvent e)
{
keyBindingContainer.TriggerReleased(column.Action.Value);
}
}
public Column(int index) public Column(int index)
{ {
Index = index; Index = index;
@ -172,5 +140,45 @@ namespace osu.Game.Rulesets.Mania.UI
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
// This probably shouldn't exist as is, but the columns in the stage are separated by a 1px border // This probably shouldn't exist as is, but the columns in the stage are separated by a 1px border
=> DrawRectangle.Inflate(new Vector2(Stage.COLUMN_SPACING / 2, 0)).Contains(ToLocalSpace(screenSpacePos)); => DrawRectangle.Inflate(new Vector2(Stage.COLUMN_SPACING / 2, 0)).Contains(ToLocalSpace(screenSpacePos));
public class ColumnTouchInputArea : Drawable
{
public ColumnTouchInputArea()
{
RelativeSizeAxes = Axes.Both;
}
private Column column => (Column)Parent;
protected override void LoadComplete()
{
keyBindingContainer = (ManiaInputManager.RulesetKeyBindingContainer)((ManiaInputManager)GetContainingInputManager()).KeyBindingContainer;
}
private ManiaInputManager.RulesetKeyBindingContainer keyBindingContainer { get; set; }
protected override bool OnMouseDown(MouseDownEvent e)
{
keyBindingContainer.TriggerPressed(column.Action.Value);
return base.OnMouseDown(e);
}
protected override void OnMouseUp(MouseUpEvent e)
{
keyBindingContainer.TriggerReleased(column.Action.Value);
base.OnMouseUp(e);
}
protected override bool OnTouchDown(TouchDownEvent e)
{
keyBindingContainer.TriggerPressed(column.Action.Value);
return true;
}
protected override void OnTouchUp(TouchUpEvent e)
{
keyBindingContainer.TriggerReleased(column.Action.Value);
}
}
} }
} }