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

Add select/deselect all buttons to free mod select screen

Browse Source
This commit is contained in:
Bartłomiej Dach 2022-05-06 16:31:59 +02:00
parent 0b95594f60
commit 852e4a9766
No known key found for this signature in database
GPG Key ID: BCECCD4FA41F6497
2 changed files with 61 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
osu.Game/Overlays/Mods/ModSelectScreen.cs
View File

@ -47,11 +47,6 @@ namespace osu.Game.Overlays.Mods
}
}
/// <summary>
/// Whether configurable <see cref="Mod"/>s can be configured by the local user.
/// </summary>
protected virtual bool AllowCustomisation => true;
/// <summary>
/// Whether the total score multiplier calculated from the current selected set of mods should be shown.
/// </summary>
@ -59,12 +54,27 @@ namespace osu.Game.Overlays.Mods
protected virtual ModColumn CreateModColumn(ModType modType, Key[]? toggleKeys = null) => new ModColumn(modType, false, toggleKeys);
protected virtual Drawable[] CreateFooterButtons() => new Drawable[]
{
customisationButton = new ShearedToggleButton(200)
{
Text = "Mod Customisation",
Active = { BindTarget = customisationVisible }
},
new ShearedButton(200)
{
Text = "Deselect All",
Action = DeselectAll
}
};
private readonly BindableBool customisationVisible = new BindableBool();
private DifficultyMultiplierDisplay? multiplierDisplay;
private ModSettingsArea modSettingsArea = null!;
private ColumnScrollContainer columnScroll = null!;
private ColumnFlowContainer columnFlow = null!;
private ShearedToggleButton? customisationButton;
[BackgroundDependencyLoader]
private void load()
@ -146,22 +156,21 @@ namespace osu.Game.Overlays.Mods
});
}
FooterContent.Padding = new MarginPadding
FooterContent.Child = new FillFlowContainer
{
Vertical = PADDING,
Horizontal = 70
};
if (AllowCustomisation)
{
FooterContent.Add(new ShearedToggleButton(200)
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Horizontal,
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Padding = new MarginPadding
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Text = "Mod Customisation",
Active = { BindTarget = customisationVisible }
});
}
Vertical = PADDING,
Horizontal = 70
},
Spacing = new Vector2(10),
Children = CreateFooterButtons()
};
}
private ColumnDimContainer createModColumnContent(ModType modType, Key[]? toggleKeys = null)
@ -216,7 +225,7 @@ namespace osu.Game.Overlays.Mods
private void updateCustomisation(ValueChangedEvent<IReadOnlyList<Mod>> valueChangedEvent)
{
if (!AllowCustomisation)
if (customisationButton == null)
return;
bool anyCustomisableMod = false;
@ -325,6 +334,18 @@ namespace osu.Game.Overlays.Mods
}
}
protected void SelectAll()
{
foreach (var column in columnFlow.Columns)
column.SelectAll();
}
protected void DeselectAll()
{
foreach (var column in columnFlow.Columns)
column.DeselectAll();
}
public override bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
{
if (e.Action == GlobalAction.Back && customisationVisible.Value)

21
osu.Game/Screens/OnlinePlay/FreeModSelectScreen.cs
View File

@ -2,6 +2,8 @@
// See the LICENCE file in the repository root for full licence text.
using System;
using osu.Framework.Graphics;
using osu.Game.Graphics.UserInterface;
using osu.Game.Overlays.Mods;
using osu.Game.Rulesets.Mods;
using osuTK.Input;
@ -10,7 +12,6 @@ namespace osu.Game.Screens.OnlinePlay
{
public class FreeModSelectScreen : ModSelectScreen
{
protected override bool AllowCustomisation => false;
protected override bool ShowTotalMultiplier => false;
public new Func<Mod, bool> IsValidMod
@ -25,5 +26,23 @@ namespace osu.Game.Screens.OnlinePlay
}
protected override ModColumn CreateModColumn(ModType modType, Key[] toggleKeys = null) => new ModColumn(modType, true, toggleKeys);
protected override Drawable[] CreateFooterButtons() => new Drawable[]
{
new ShearedButton(200)
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Text = "Select All",
Action = SelectAll
},
new ShearedButton(200)
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Text = "Deselect All",
Action = DeselectAll
}
};
}
}