h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-03 21:13:22 +08:00
Code Issues Releases Wiki Activity

Replace old mod select overlay with new design

Browse Source
This commit is contained in:
Bartłomiej Dach 2022-05-04 21:49:02 +02:00
parent e2895ea145
commit 407db7ff9d
No known key found for this signature in database
GPG Key ID: BCECCD4FA41F6497
3 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
View File

@ -551,7 +551,7 @@ namespace osu.Game.Tests.Visual.Navigation
public class TestPlaySongSelect : PlaySongSelect public class TestPlaySongSelect : PlaySongSelect
{ {
public ModSelectOverlay ModSelectOverlay => ModSelect; public ModSelectScreen ModSelectOverlay => ModSelect;
public BeatmapOptionsOverlay BeatmapOptionsOverlay => BeatmapOptions; public BeatmapOptionsOverlay BeatmapOptionsOverlay => BeatmapOptions;

2
osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
View File

@ -153,7 +153,7 @@ namespace osu.Game.Screens.OnlinePlay
return base.OnExiting(e); return base.OnExiting(e);
} }
protected override ModSelectOverlay CreateModSelectOverlay() => new UserModSelectOverlay protected override ModSelectScreen CreateModSelectOverlay() => new UserModSelectScreen
{ {
IsValidMod = IsValidMod IsValidMod = IsValidMod
}; };

36
osu.Game/Screens/Select/SongSelect.cs
View File

@ -101,7 +101,7 @@ namespace osu.Game.Screens.Select
[Resolved(CanBeNull = true)] [Resolved(CanBeNull = true)]
private LegacyImportManager legacyImportManager { get; set; } private LegacyImportManager legacyImportManager { get; set; }
protected ModSelectOverlay ModSelect { get; private set; } protected ModSelectScreen ModSelect { get; private set; }
protected Sample SampleConfirm { get; private set; } protected Sample SampleConfirm { get; private set; }
@ -252,35 +252,19 @@ namespace osu.Game.Screens.Select
{ {
AddRangeInternal(new Drawable[] AddRangeInternal(new Drawable[]
{ {
new GridContainer // used for max height implementation FooterPanels = new Container
{ {
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
RowDimensions = new[] Padding = new MarginPadding { Bottom = Footer.HEIGHT },
Children = new Drawable[]
{ {
new Dimension(), BeatmapOptions = new BeatmapOptionsOverlay(),
new Dimension(GridSizeMode.Relative, 1f, maxSize: ModSelectOverlay.HEIGHT + Footer.HEIGHT),
},
Content = new[]
{
null,
new Drawable[]
{
FooterPanels = new Container
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Bottom = Footer.HEIGHT },
Children = new Drawable[]
{
BeatmapOptions = new BeatmapOptionsOverlay(),
ModSelect = CreateModSelectOverlay()
}
}
}
} }
}, },
Footer = new Footer() Footer = new Footer(),
ModSelect = CreateModSelectOverlay()
}); });
} }
@ -332,7 +316,7 @@ namespace osu.Game.Screens.Select
(new FooterButtonOptions(), BeatmapOptions) (new FooterButtonOptions(), BeatmapOptions)
}; };
protected virtual ModSelectOverlay CreateModSelectOverlay() => new UserModSelectOverlay(); protected virtual ModSelectScreen CreateModSelectOverlay() => new UserModSelectScreen();
protected virtual void ApplyFilterToCarousel(FilterCriteria criteria) protected virtual void ApplyFilterToCarousel(FilterCriteria criteria)
{ {