h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 23:52:57 +08:00
Code Issues Releases Wiki Activity

Merge pull request #21718 from bdach/fix-welcome-screen-buttons

Browse Source 
Fix welcome screen language buttons not working
This commit is contained in:
Dean Herbert 2022-12-20 13:16:19 +09:00 committed by GitHub
commit f117f76b2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Graphics/Containers/OsuClickableContainer.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
@ -46,5 +47,8 @@ namespace osu.Game.Graphics.Containers
AddInternal(content); AddInternal(content);
Add(CreateHoverSounds(sampleSet)); Add(CreateHoverSounds(sampleSet));
} }
protected override void ClearInternal(bool disposeChildren = true) =>
throw new InvalidOperationException($"Clearing {nameof(InternalChildren)} will cause critical failure. Use {nameof(Clear)} instead.");
} }
} }

4
osu.Game/Overlays/FirstRunSetup/ScreenWelcome.cs
View File

@ -147,7 +147,7 @@ namespace osu.Game.Overlays.FirstRunSetup
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
{ {
InternalChildren = new Drawable[] AddRange(new Drawable[]
{ {
backgroundBox = new Box backgroundBox = new Box
{ {
@ -162,7 +162,7 @@ namespace osu.Game.Overlays.FirstRunSetup
Colour = colourProvider.Light1, Colour = colourProvider.Light1,
Text = Language.GetDescription(), Text = Language.GetDescription(),
} }
}; });
} }
protected override void LoadComplete() protected override void LoadComplete()