mirror of
https://github.com/ppy/osu.git
synced 2025-01-14 20:25:39 +08:00
Fix regression in interaction when panels are not selectable
This commit is contained in:
parent
1f6e1cbe56
commit
0aa8a20d57
@ -365,7 +365,7 @@ namespace osu.Game.Screens.OnlinePlay
|
|||||||
AutoSizeAxes = Axes.Both,
|
AutoSizeAxes = Axes.Both,
|
||||||
Margin = new MarginPadding { Left = 8, Right = 8 },
|
Margin = new MarginPadding { Left = 8, Right = 8 },
|
||||||
},
|
},
|
||||||
mainFillFlow = new MainFlow(() => SelectedItem.Value == Model)
|
mainFillFlow = new MainFlow(() => SelectedItem.Value == Model || !AllowSelection)
|
||||||
{
|
{
|
||||||
Anchor = Anchor.CentreLeft,
|
Anchor = Anchor.CentreLeft,
|
||||||
Origin = Anchor.CentreLeft,
|
Origin = Anchor.CentreLeft,
|
||||||
@ -671,13 +671,13 @@ namespace osu.Game.Screens.OnlinePlay
|
|||||||
|
|
||||||
public partial class MainFlow : FillFlowContainer
|
public partial class MainFlow : FillFlowContainer
|
||||||
{
|
{
|
||||||
private readonly Func<bool> isSelected;
|
private readonly Func<bool> allowInteraction;
|
||||||
|
|
||||||
public override bool PropagatePositionalInputSubTree => isSelected();
|
public override bool PropagatePositionalInputSubTree => allowInteraction();
|
||||||
|
|
||||||
public MainFlow(Func<bool> isSelected)
|
public MainFlow(Func<bool> allowInteraction)
|
||||||
{
|
{
|
||||||
this.isSelected = isSelected;
|
this.allowInteraction = allowInteraction;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user