RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #507 from Jorolf/seperateCursorSize 

Separated menu and gameplay cursor size
This commit is contained in:
Dean Herbert 2017-03-22 08:19:12 +09:00 committed by GitHub
parent 7d8c2c9a15 b00f86d809
commit 91f088e67e
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Configuration/OsuConfigManager.cs
View File

@ -23,7 +23,8 @@ protected override void InitialiseDefaults()
Set(OsuConfig.SavePassword, false);
Set(OsuConfig.SaveUsername, true);
Set(OsuConfig.CursorSize, 1.0, 0.5f, 2);
Set(OsuConfig.MenuCursorSize, 1.0, 0.5f, 2);
Set(OsuConfig.GameplayCursorSize, 1.0, 0.5f, 2);
Set(OsuConfig.DimLevel, 30, 0, 100);
Set(OsuConfig.MouseDisableButtons, false);
@ -223,7 +224,8 @@ public enum OsuConfig
ComboFireHeight,
ConfirmExit,
AutoSendNowPlaying,
CursorSize,
MenuCursorSize,
GameplayCursorSize,
AutomaticCursorSizing,
DimLevel,
Display,

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

@ -54,7 +54,7 @@ public OsuCursor()
[BackgroundDependencyLoader]
private void load(OsuConfigManager config)
{
cursorScale = config.GetBindable<double>(OsuConfig.CursorSize);
cursorScale = config.GetBindable<double>(OsuConfig.GameplayCursorSize);
Children = new Drawable[]
{

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

@ -97,7 +97,7 @@ public Cursor()
[BackgroundDependencyLoader]
private void load(OsuConfigManager config, TextureStore textures, OsuColour colour)
{
cursorScale = config.GetBindable<double>(OsuConfig.CursorSize);
cursorScale = config.GetBindable<double>(OsuConfig.MenuCursorSize);
Children = new Drawable[]
{

9
osu.Game/Overlays/Options/Sections/SkinSection.cs
View File

@ -61,8 +61,13 @@ private void load(OsuConfigManager config)
},
new OptionSlider<double>
{
LabelText = "Cursor size",
Bindable = (BindableDouble)config.GetBindable<double>(OsuConfig.CursorSize)
LabelText = "Menu cursor size",
Bindable = (BindableDouble)config.GetBindable<double>(OsuConfig.MenuCursorSize)
},
new OptionSlider<double>
{
LabelText = "Gameplay cursor size",
Bindable = (BindableDouble)config.GetBindable<double>(OsuConfig.GameplayCursorSize)
},
new OsuCheckbox
{