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

Merge branch 'master' into download-tracking-component

Browse Source
This commit is contained in:
Dan Balasescu 2019-01-31 21:18:03 +09:00 committed by GitHub
commit 9968bdc0e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/OsuGame.cs
View File

@ -169,7 +169,7 @@ namespace osu.Game
dependencies.CacheAs(ruleset);
dependencies.CacheAs<IBindable<RulesetInfo>>(ruleset);
dependencies.Cache(osuLogo = new OsuLogo());
dependencies.Cache(osuLogo = new OsuLogo { Alpha = 0 });
// bind config int to database RulesetInfo
configRuleset = LocalConfig.GetBindable<int>(OsuSetting.Ruleset);

7
osu.Game/Overlays/AccountCreation/ScreenEntry.cs
View File

@ -10,6 +10,7 @@ using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.MathUtils;
using osu.Framework.Platform;
using osu.Framework.Screens;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
@ -38,11 +39,13 @@ namespace osu.Game.Overlays.AccountCreation
private OsuTextBox[] textboxes;
private ProcessingOverlay processingOverlay;
private GameHost host;
[BackgroundDependencyLoader]
private void load(OsuColour colours, APIAccess api)
private void load(OsuColour colours, APIAccess api, GameHost host)
{
this.api = api;
this.host = host;
InternalChildren = new Drawable[]
{
@ -139,7 +142,7 @@ namespace osu.Game.Overlays.AccountCreation
{
base.Update();
if (!textboxes.Any(t => t.HasFocus))
if (host?.OnScreenKeyboardOverlapsGameWindow != true && !textboxes.Any(t => t.HasFocus))
focusNextTextbox();
}