h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 01:52:55 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fix-circularprogress-glow

Browse Source
This commit is contained in:
Dean Herbert 2018-03-23 19:49:18 +09:00 committed by GitHub
commit 32b7565fac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 59 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game.Rulesets.Osu/UI/Cursor/GameplayCursor.cs
View File

@ -11,6 +11,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Bindings; using osu.Framework.Input.Bindings;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Configuration; using osu.Game.Configuration;
using osu.Game.Skinning;
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
@ -82,7 +83,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
public class OsuCursor : Container public class OsuCursor : Container
{ {
private Container cursorContainer; private Drawable cursorContainer;
private Bindable<double> cursorScale; private Bindable<double> cursorScale;
private Bindable<bool> autoCursorScale; private Bindable<bool> autoCursorScale;
@ -97,12 +98,8 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuConfigManager config, OsuGameBase game) private void load(OsuConfigManager config, OsuGameBase game)
{ {
Children = new Drawable[] Child = cursorContainer = new SkinnableDrawable("cursor", _ => new CircularContainer
{ {
cursorContainer = new CircularContainer
{
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Masking = true, Masking = true,
BorderThickness = Size.X / 6, BorderThickness = Size.X / 6,
@ -156,7 +153,11 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
}, },
}, },
} }
}, }, restrictSize: false)
{
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
RelativeSizeAxes = Axes.Both,
}; };
beatmap = game.Beatmap.GetBoundCopy(); beatmap = game.Beatmap.GetBoundCopy();