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

Merge pull request #532 from peppy/general-fixes

Browse Source 
Fix menu cursor size not sticking on startup.
This commit is contained in:
Dan Balasescu 2017-03-23 08:48:22 +09:00 committed by GitHub
commit 972c56c73b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Graphics/Cursor/GameplayCursor.cs
View File

@ -54,8 +54,6 @@ namespace osu.Game.Graphics.Cursor
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuConfigManager config) private void load(OsuConfigManager config)
{ {
cursorScale = config.GetBindable<double>(OsuConfig.GameplayCursorSize);
Children = new Drawable[] Children = new Drawable[]
{ {
cursorContainer = new CircularContainer cursorContainer = new CircularContainer
@ -63,7 +61,6 @@ namespace osu.Game.Graphics.Cursor
Origin = Anchor.Centre, Origin = Anchor.Centre,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Scale = new Vector2((float)cursorScale),
Masking = true, Masking = true,
BorderThickness = Size.X / 6, BorderThickness = Size.X / 6,
BorderColour = Color4.White, BorderColour = Color4.White,
@ -119,7 +116,9 @@ namespace osu.Game.Graphics.Cursor
}, },
}; };
cursorScale = config.GetBindable<double>(OsuConfig.GameplayCursorSize);
cursorScale.ValueChanged += scaleChanged; cursorScale.ValueChanged += scaleChanged;
cursorScale.TriggerChange();
} }
private void scaleChanged(object sender, EventArgs e) private void scaleChanged(object sender, EventArgs e)

5
osu.Game/Graphics/Cursor/MenuCursor.cs
View File

@ -97,8 +97,6 @@ namespace osu.Game.Graphics.Cursor
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuConfigManager config, TextureStore textures, OsuColour colour) private void load(OsuConfigManager config, TextureStore textures, OsuColour colour)
{ {
cursorScale = config.GetBindable<double>(OsuConfig.MenuCursorSize);
Children = new Drawable[] Children = new Drawable[]
{ {
cursorContainer = new Container cursorContainer = new Container
@ -122,7 +120,10 @@ namespace osu.Game.Graphics.Cursor
} }
} }
}; };
cursorScale = config.GetBindable<double>(OsuConfig.MenuCursorSize);
cursorScale.ValueChanged += scaleChanged; cursorScale.ValueChanged += scaleChanged;
cursorScale.TriggerChange();
} }
private void scaleChanged(object sender, EventArgs e) private void scaleChanged(object sender, EventArgs e)