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

Merge branch 'master' into argon-pro-skin

Browse Source
This commit is contained in:
Bartłomiej Dach 2022-12-20 19:34:56 +01:00 committed by GitHub
commit 378486cbe0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,7 +126,8 @@ namespace osu.Game.Overlays.FirstRunSetup
if (available)
{
copyInformation.Text = "Data migration will use \"hard links\". No extra disk space will be used, and you can delete either data folder at any point without affecting the other installation.";
copyInformation.Text =
"Data migration will use \"hard links\". No extra disk space will be used, and you can delete either data folder at any point without affecting the other installation.";
}
else if (RuntimeInfo.OS != RuntimeInfo.Platform.Windows)
copyInformation.Text = "Lightweight linking of files is not supported on your operating system yet, so a copy of all files will be made during import.";
@ -173,6 +174,18 @@ namespace osu.Game.Overlays.FirstRunSetup
c.Current.Disabled = !allow;
}
public override void OnSuspending(ScreenTransitionEvent e)
{
stableLocatorTextBox.HidePopover();
base.OnSuspending(e);
}
public override bool OnExiting(ScreenExitEvent e)
{
stableLocatorTextBox.HidePopover();
return base.OnExiting(e);
}
private partial class ImportCheckbox : SettingsCheckbox
{
public readonly StableContent StableContent;

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";