mirror of
https://github.com/ppy/osu.git
synced 2024-11-13 18:47:27 +08:00
Merge branch 'master' into ui-scale-only-show-one-screen
This commit is contained in:
commit
8ead606065
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user