Skip to content

Commit

Permalink
Merge pull request ppy#31383 from peppy/editor-toolbar-scrolling-weird
Browse files Browse the repository at this point in the history
Always block scroll input above editor toolbox areas
  • Loading branch information
smoogipoo authored Jan 2, 2025
2 parents 6546dc0 + cca63b5 commit 1cb2c86
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions osu.Game/Rulesets/Edit/ExpandingToolboxContainer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,6 @@ protected override void Update()
}
}

protected override bool ReceivePositionalInputAtSubTree(Vector2 screenSpacePos) => base.ReceivePositionalInputAtSubTree(screenSpacePos) && anyToolboxHovered(screenSpacePos);

public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => base.ReceivePositionalInputAt(screenSpacePos) && anyToolboxHovered(screenSpacePos);

private bool anyToolboxHovered(Vector2 screenSpacePos) => FillFlow.ScreenSpaceDrawQuad.Contains(screenSpacePos);

protected override bool OnMouseDown(MouseDownEvent e) => true;

protected override bool OnClick(ClickEvent e) => true;
Expand Down

0 comments on commit 1cb2c86

Please sign in to comment.