Merge remote-tracking branch 'upstream/master' into smooth-path

This commit is contained in:
Dean Herbert
2018-10-12 16:03:36 +09:00
23 changed files with 54 additions and 63 deletions

View File

@ -51,6 +51,8 @@ namespace osu.Game.Graphics.UserInterface
#region OsuDropdownMenu
protected class OsuDropdownMenu : DropdownMenu, IHasAccentColour
{
public override bool HandleNonPositionalInput => State == MenuState.Open;
// todo: this uses the same styling as OsuMenu. hopefully we can just use OsuMenu in the future with some refactoring
public OsuDropdownMenu()
{