mirror of
https://github.com/ppy/osu.git
synced 2024-12-15 12:02:54 +08:00
Merge pull request #532 from peppy/general-fixes
Fix menu cursor size not sticking on startup.
This commit is contained in:
commit
972c56c73b
@ -54,8 +54,6 @@ namespace osu.Game.Graphics.Cursor
|
||||
[BackgroundDependencyLoader]
|
||||
private void load(OsuConfigManager config)
|
||||
{
|
||||
cursorScale = config.GetBindable<double>(OsuConfig.GameplayCursorSize);
|
||||
|
||||
Children = new Drawable[]
|
||||
{
|
||||
cursorContainer = new CircularContainer
|
||||
@ -63,7 +61,6 @@ namespace osu.Game.Graphics.Cursor
|
||||
Origin = Anchor.Centre,
|
||||
Anchor = Anchor.Centre,
|
||||
RelativeSizeAxes = Axes.Both,
|
||||
Scale = new Vector2((float)cursorScale),
|
||||
Masking = true,
|
||||
BorderThickness = Size.X / 6,
|
||||
BorderColour = Color4.White,
|
||||
@ -119,7 +116,9 @@ namespace osu.Game.Graphics.Cursor
|
||||
},
|
||||
};
|
||||
|
||||
cursorScale = config.GetBindable<double>(OsuConfig.GameplayCursorSize);
|
||||
cursorScale.ValueChanged += scaleChanged;
|
||||
cursorScale.TriggerChange();
|
||||
}
|
||||
|
||||
private void scaleChanged(object sender, EventArgs e)
|
||||
|
@ -97,8 +97,6 @@ namespace osu.Game.Graphics.Cursor
|
||||
[BackgroundDependencyLoader]
|
||||
private void load(OsuConfigManager config, TextureStore textures, OsuColour colour)
|
||||
{
|
||||
cursorScale = config.GetBindable<double>(OsuConfig.MenuCursorSize);
|
||||
|
||||
Children = new Drawable[]
|
||||
{
|
||||
cursorContainer = new Container
|
||||
@ -122,7 +120,10 @@ namespace osu.Game.Graphics.Cursor
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
cursorScale = config.GetBindable<double>(OsuConfig.MenuCursorSize);
|
||||
cursorScale.ValueChanged += scaleChanged;
|
||||
cursorScale.TriggerChange();
|
||||
}
|
||||
|
||||
private void scaleChanged(object sender, EventArgs e)
|
||||
|
Loading…
Reference in New Issue
Block a user