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

Ask for VisibilityContainer explicitly

Browse Source
This commit is contained in:
Salman Ahmed 2024-07-10 11:12:52 +03:00
parent 9a88281ab0
commit 002679ebb0
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/UserInterface/TestSceneScreenFooter.cs
View File

@ -210,7 +210,7 @@ namespace osu.Game.Tests.Visual.UserInterface
return false; return false;
} }
public override Drawable CreateFooterContent() => new TestFooterContent(); public override VisibilityContainer CreateFooterContent() => new TestFooterContent();
public partial class TestFooterContent : VisibilityContainer public partial class TestFooterContent : VisibilityContainer
{ {

2
osu.Game/Overlays/FirstRunSetupOverlay.cs
View File

@ -150,7 +150,7 @@ namespace osu.Game.Overlays
private FirstRunSetupFooterContent? currentFooterContent; private FirstRunSetupFooterContent? currentFooterContent;
public override Drawable CreateFooterContent() public override VisibilityContainer CreateFooterContent()
{ {
currentFooterContent = new FirstRunSetupFooterContent currentFooterContent = new FirstRunSetupFooterContent
{ {

2
osu.Game/Overlays/Mods/ModSelectOverlay.cs
View File

@ -256,7 +256,7 @@ namespace osu.Game.Overlays.Mods
private ModSelectFooterContent? currentFooterContent; private ModSelectFooterContent? currentFooterContent;
public override Drawable CreateFooterContent() => currentFooterContent = new ModSelectFooterContent(this) public override VisibilityContainer CreateFooterContent() => currentFooterContent = new ModSelectFooterContent(this)
{ {
Beatmap = { BindTarget = Beatmap }, Beatmap = { BindTarget = Beatmap },
ActiveMods = { BindTarget = ActiveMods }, ActiveMods = { BindTarget = ActiveMods },

2
osu.Game/Overlays/Mods/ShearedOverlayContainer.cs
View File

@ -104,7 +104,7 @@ namespace osu.Game.Overlays.Mods
/// <summary> /// <summary>
/// Creates content to be displayed on the game-wide footer. /// Creates content to be displayed on the game-wide footer.
/// </summary> /// </summary>
public virtual Drawable CreateFooterContent() => Empty(); public virtual VisibilityContainer? CreateFooterContent() => null;
/// <summary> /// <summary>
/// Invoked when the back button in the footer is pressed. /// Invoked when the back button in the footer is pressed.

2
osu.Game/Screens/Footer/ScreenFooter.cs
View File

@ -218,7 +218,7 @@ namespace osu.Game.Screens.Footer
updateColourScheme(overlay.ColourProvider.ColourScheme); updateColourScheme(overlay.ColourProvider.ColourScheme);
var content = overlay.CreateFooterContent(); var content = overlay.CreateFooterContent() ?? Empty();
Add(contentContainer = new Container Add(contentContainer = new Container
{ {

3
osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
View File

@ -6,6 +6,7 @@ using osu.Game.Overlays;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Overlays.Mods; using osu.Game.Overlays.Mods;
using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Mods;
@ -34,7 +35,7 @@ namespace osu.Game.Screens.OnlinePlay
protected override ModColumn CreateModColumn(ModType modType) => new ModColumn(modType, true); protected override ModColumn CreateModColumn(ModType modType) => new ModColumn(modType, true);
public override Drawable CreateFooterContent() => currentFooterContent = new FreeModSelectFooterContent(this) public override VisibilityContainer CreateFooterContent() => currentFooterContent = new FreeModSelectFooterContent(this)
{ {
Beatmap = { BindTarget = Beatmap }, Beatmap = { BindTarget = Beatmap },
ActiveMods = { BindTarget = ActiveMods }, ActiveMods = { BindTarget = ActiveMods },