Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix buttons receiving input outside the content #21619

Merged
merged 9 commits into from
Dec 13, 2022
Merged

Fix buttons receiving input outside the content #21619

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
37a0756
Add tests
EVAST9919 Dec 12, 2022
7e39f17
Fix OsuButton input receiving
EVAST9919 Dec 12, 2022
d2b3533
Fix OsuClickableContainer input receiving
EVAST9919 Dec 12, 2022
b0d475c
CI fix
EVAST9919 Dec 12, 2022
890dd9c
Fix input doesn't take original drawable modifications into account
EVAST9919 Dec 12, 2022
15bd82a
Fix DrawableUsername being affected
EVAST9919 Dec 12, 2022
edc7820
Add comments about why both positional input checks are required in `…
peppy Dec 13, 2022
efe0571
Make `OsuButton` `abstract`
peppy Dec 13, 2022
dfb8f4f
Merge branch 'master' into buttons-fix
bdach Dec 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix OsuClickableContainer input receiving
  • Loading branch information
@EVAST9919
EVAST9919 committed Dec 12, 2022
commit d2b3533356d22d3ac0350e3c8f3eb08a561413de
12 changes: 5 additions & 7 deletions osu.Game/Graphics/Containers/OsuClickableContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

#nullable disable

using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Localisation;
using osu.Game.Graphics.UserInterface;
using osuTK;

namespace osu.Game.Graphics.Containers
{
Expand All @@ -18,6 +17,8 @@ public partial class OsuClickableContainer : ClickableContainer, IHasTooltip

private readonly Container content = new Container { RelativeSizeAxes = Axes.Both };

public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Content.ReceivePositionalInputAt(screenSpacePos);

protected override Container<Drawable> Content => content;

protected virtual HoverSounds CreateHoverSounds(HoverSampleSet sampleSet) => new HoverClickSounds(sampleSet) { Enabled = { BindTarget = Enabled } };
Expand All @@ -38,11 +39,8 @@ private void load()
content.AutoSizeAxes = AutoSizeAxes;
}

InternalChildren = new Drawable[]
{
content,
CreateHoverSounds(sampleSet)
};
AddInternal(content);
Add(CreateHoverSounds(sampleSet));
}
}
}