sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 22:26:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:ppy/osu into SirCmpwn/options-sidebar-tracking

Browse Source 
# Conflicts:
#	osu.Game/osu.Game.csproj
This commit is contained in:
Thomas Müller
2016-11-12 12:24:02 +01:00
parent 00cc4278da c7f8d2450a
commit 98b69bc6c6
79 changed files with 1156 additions and 806 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Overlays/OptionsOverlay.cs
View File

@ -7,12 +7,14 @@ using OpenTK;
using OpenTK.Graphics;
using OpenTK.Input;
using osu.Framework;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Transformations;
using osu.Framework.Input;
using osu.Game.Configuration;
using osu.Game.Overlays.Options;
using osu.Game.Overlays.Options.Audio;
using osu.Game.Overlays.Options.Gameplay;
@ -120,11 +122,10 @@ namespace osu.Game.Overlays
};
}
protected override void Load(BaseGame game)
[BackgroundDependencyLoader(permitNulls: true)]
private void load(OsuGame game)
{
base.Load(game);
scrollContainer.Padding = new MarginPadding { Top = (game as OsuGame)?.Toolbar.DrawHeight ?? 0 };
scrollContainer.Padding = new MarginPadding { Top = game?.Toolbar.DrawHeight ?? 0 };
}
protected override void Update()