h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 00:47:24 +08:00
Code Issues Releases Wiki Activity

Remove local footer from ShearedOverlayContainer

Browse Source
This commit is contained in:
Salman Ahmed 2024-06-30 04:22:59 +03:00
parent 5dd822ea38
commit e57a0029f1
4 changed files with 3 additions and 50 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

@ -185,8 +185,6 @@ namespace osu.Game.Tests.Visual.UserInterface
private partial class TestShearedOverlayContainer : ShearedOverlayContainer
{
public override bool UseNewFooter => true;
public TestShearedOverlayContainer()
: base(OverlayColourScheme.Orange)
{

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

@ -150,8 +150,6 @@ namespace osu.Game.Overlays
private FirstRunSetupFooterContent? currentFooterContent;
public override bool UseNewFooter => true;
public override Drawable CreateFooterContent() => currentFooterContent = new FirstRunSetupFooterContent
{
ShowNextStep = showNextStep,

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

@ -255,8 +255,6 @@ namespace osu.Game.Overlays.Mods
private ModSelectFooterContent? currentFooterContent;
public override bool UseNewFooter => true;
public override Drawable CreateFooterContent() => currentFooterContent = new ModSelectFooterContent(this)
{
Beatmap = { BindTarget = Beatmap },

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

@ -7,7 +7,6 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface;
using osu.Game.Screens.Footer;
@ -30,17 +29,9 @@ namespace osu.Game.Overlays.Mods
/// </summary>
protected ShearedOverlayHeader Header { get; private set; } = null!;
/// <summary>
/// The overlay's footer.
/// </summary>
protected Container Footer { get; private set; }
[Resolved]
private ScreenFooter? footer { get; set; }
// todo: very temporary property that will be removed once ModSelectOverlay and FirstRunSetupOverlay are updated to use new footer.
public virtual bool UseNewFooter => false;
/// <summary>
/// A container containing all content, including the header and footer.
/// May be used for overlay-wide animations.
@ -52,11 +43,6 @@ namespace osu.Game.Overlays.Mods
/// </summary>
protected Container MainAreaContent { get; private set; } = null!;
/// <summary>
/// A container for content that is to be displayed inside the footer.
/// </summary>
protected Container FooterContent { get; private set; }
protected override bool StartHidden => true;
protected override bool BlockNonPositionalInput => true;
@ -75,8 +61,6 @@ namespace osu.Game.Overlays.Mods
[BackgroundDependencyLoader]
private void load()
{
const float footer_height = ScreenFooter.HEIGHT;
Child = TopLevelContent = new Container
{
RelativeSizeAxes = Axes.Both,
@ -100,30 +84,9 @@ namespace osu.Game.Overlays.Mods
Padding = new MarginPadding
{
Top = ShearedOverlayHeader.HEIGHT,
Bottom = footer_height + PADDING,
Bottom = ScreenFooter.HEIGHT + PADDING,
}
},
Footer = new InputBlockingContainer
{
RelativeSizeAxes = Axes.X,
Depth = float.MinValue,
Height = footer_height,
Margin = new MarginPadding { Top = PADDING },
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = ColourProvider.Background5
},
FooterContent = new Container
{
RelativeSizeAxes = Axes.Both,
},
}
}
}
};
}
@ -160,7 +123,7 @@ namespace osu.Game.Overlays.Mods
Header.MoveToY(0, fade_in_duration, Easing.OutQuint);
if (UseNewFooter && footer != null)
if (footer != null)
{
footer.SetOverlayContent(this);
@ -170,8 +133,6 @@ namespace osu.Game.Overlays.Mods
hideFooterOnPopOut = true;
}
}
else
Footer.MoveToY(0, fade_in_duration, Easing.OutQuint);
}
protected override void PopOut()
@ -183,7 +144,7 @@ namespace osu.Game.Overlays.Mods
Header.MoveToY(-Header.DrawHeight, fade_out_duration, Easing.OutQuint);
if (UseNewFooter && footer != null)
if (footer != null)
{
footer.ClearOverlayContent();
@ -193,8 +154,6 @@ namespace osu.Game.Overlays.Mods
hideFooterOnPopOut = false;
}
}
else
Footer.MoveToY(Footer.DrawHeight, fade_out_duration, Easing.OutQuint);
}
}
}