Merge branch 'master' into toolbar-button-swap

This commit is contained in:
Dan Balasescu
2017-08-17 10:39:02 +09:00
committed by GitHub
17 changed files with 263 additions and 165 deletions

View File

@ -22,8 +22,6 @@ namespace osu.Game.Overlays.Toolbar
private readonly ToolbarUserArea userArea;
protected override bool HideOnEscape => false;
protected override bool BlockPassThroughMouse => false;
private const double transition_time = 500;