h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-06 13:47:21 +08:00
Code Issues Releases Wiki Activity

Merge branch 'tooltips' of github.com:Jorolf/osu into tooltips

Browse Source
This commit is contained in:
Jorolf 2017-04-17 17:43:54 +02:00
commit 906d68936a
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Desktop.VisualTests/Tests/TestCaseTooltip.cs
View File

@ -47,7 +47,6 @@ namespace osu.Desktop.VisualTests.Tests
}, },
}; };
slider.Current.BindTo(new BindableInt(5) slider.Current.BindTo(new BindableInt(5)
{ {
MaxValue = 10, MaxValue = 10,
@ -72,7 +71,6 @@ namespace osu.Desktop.VisualTests.Tests
} }
}; };
} }
} }
private class TooltipTextbox : OsuTextBox, IHasTooltip private class TooltipTextbox : OsuTextBox, IHasTooltip

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

@ -134,7 +134,7 @@ namespace osu.Game.Graphics.Cursor
Texture = textures.Get(@"Cursor/menu-cursor-additive"), Texture = textures.Get(@"Cursor/menu-cursor-additive"),
}, },
} }
}, }
}; };
cursorScale = config.GetBindable<double>(OsuConfig.MenuCursorSize); cursorScale = config.GetBindable<double>(OsuConfig.MenuCursorSize);