RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-23 15:22:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21730 from peppy/ui-scale-only-show-one-screen

Browse Source 
Only show song select for now at ui scale adjust first run screen
This commit is contained in:
Bartłomiej Dach 2022-12-20 19:12:01 +01:00 committed by GitHub
commit 006ed6dae4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Overlays/FirstRunSetup/ScreenUIScale.cs
View File

@ -13,7 +13,6 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Textures;
using osu.Framework.Localisation;
using osu.Framework.Screens;
using osu.Game.Beatmaps;
using osu.Game.Configuration;
using osu.Game.Graphics;
@ -58,7 +57,7 @@ namespace osu.Game.Overlays.FirstRunSetup
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
RelativeSizeAxes = Axes.None,
Size = new Vector2(screen_width, screen_width / 16f * 9 / 2),
Size = new Vector2(screen_width, screen_width / 16f * 9),
Children = new Drawable[]
{
new GridContainer
@ -68,7 +67,6 @@ namespace osu.Game.Overlays.FirstRunSetup
{
new Drawable[]
{
new SampleScreenContainer(new PinnedMainMenu()),
new SampleScreenContainer(new NestedSongSelect()),
},
// TODO: add more screens here in the future (gameplay / results)
@ -109,17 +107,6 @@ namespace osu.Game.Overlays.FirstRunSetup
public override bool? AllowTrackAdjustments => false;
}
private partial class PinnedMainMenu : MainMenu
{
public override void OnEntering(ScreenTransitionEvent e)
{
base.OnEntering(e);
Buttons.ReturnToTopOnIdle = false;
Buttons.State = ButtonSystemState.TopLevel;
}
}
private partial class UIScaleSlider : OsuSliderBar<float>
{
public override LocalisableString TooltipText => base.TooltipText + "x";