Merge branch 'master' into profile

This commit is contained in:
Huo Yaoyuan
2017-06-25 10:29:14 +08:00
27 changed files with 22 additions and 51 deletions

View File

@ -23,7 +23,7 @@ namespace osu.Game.Graphics.UserInterface
protected override TabItem<T> CreateTabItem(T value) => new OsuTabItem(value);
protected override bool InternalContains(Vector2 screenSpacePos) => base.InternalContains(screenSpacePos) || Dropdown?.Contains(screenSpacePos) == true;
public override bool Contains(Vector2 screenSpacePos) => base.Contains(screenSpacePos) || Dropdown?.Contains(screenSpacePos) == true;
private static bool isEnumType => typeof(T).IsEnum;