h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-28 04:14:26 +08:00
Code Issues Releases Wiki Activity

Fix context menu not working due to too much blocking

Browse Source
This commit is contained in:
Dean Herbert
2025-08-04 17:33:05 +09:00
Unverified
parent b83a3dc105
commit 3557207609
2 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Graphics/InputBlockingContainer.cs
+2
View File
@@ -8,6 +8,8 @@ namespace osu.Game.Graphics
{
/// <summary>
/// A simple container which blocks input events from travelling through it.
///
/// Note that this will block right clicks as well. Special care needs to be taken to not break context menus from displaying.
/// </summary>
public partial class InputBlockingContainer : Container
{
osu.Game/Screens/SelectV2/BeatmapLeaderboardWedge.cs
+25 -18
View File
@@ -149,27 +149,33 @@ namespace osu.Game.Screens.SelectV2
Children = new Drawable[]
{
new WedgeBackground(),
new Container
// Required because wedge background blocks input from passing through
// to the main context menu container above.
new OsuContextMenuContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Shear = -OsuGame.SHEAR,
Padding = new MarginPadding { Top = 5f, Bottom = 5f, Left = 70f, Right = 10f },
Children = new Drawable[]
RelativeSizeAxes = Axes.Both,
Child = new Container
{
personalBestText = new OsuSpriteText
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Padding = new MarginPadding { Top = 5f, Bottom = 5f, Left = 70f, Right = 10f },
Children = new Drawable[]
{
Colour = colourProvider.Content2,
Font = OsuFont.Style.Caption1.With(weight: FontWeight.SemiBold),
},
personalBestScoreContainer = new Container<BeatmapLeaderboardScore>
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Margin = new MarginPadding { Top = 20f },
},
}
},
personalBestText = new OsuSpriteText
{
Colour = colourProvider.Content2,
Font = OsuFont.Style.Caption1.With(weight: FontWeight.SemiBold),
},
personalBestScoreContainer = new Container<BeatmapLeaderboardScore>
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Margin = new MarginPadding { Top = 20f },
},
}
},
}
},
},
placeholderContainer = new Container<Placeholder>
@@ -241,7 +247,8 @@ namespace osu.Game.Screens.SelectV2
// For now, we forcefully refresh to keep things simple.
// In the future, removing this requirement may be deemed useful, but will need ample testing of edge case scenarios
// (like returning from gameplay after setting a new score, returning to song select after main menu).
leaderboardManager.FetchWithCriteria(new LeaderboardCriteria(fetchBeatmapInfo, fetchRuleset, Scope.Value, FilterBySelectedMods.Value ? mods.Value.ToArray() : null, fetchSorting), forceRefresh: true);
leaderboardManager.FetchWithCriteria(new LeaderboardCriteria(fetchBeatmapInfo, fetchRuleset, Scope.Value, FilterBySelectedMods.Value ? mods.Value.ToArray() : null, fetchSorting),
forceRefresh: true);
if (!initialFetchComplete)
{