Merge branch 'master' into sharpen

This commit is contained in:
Huo Yaoyuan
2019-11-20 17:30:58 +08:00
54 changed files with 282 additions and 114 deletions

View File

@ -16,7 +16,7 @@ namespace osu.Game.Graphics.UserInterface
private Color4? iconColour;
/// <summary>
/// The icon colour. This does not affect <see cref="IconButton.Colour"/>.
/// The icon colour. This does not affect <see cref="Drawable.Colour">Colour</see>.
/// </summary>
public Color4 IconColour
{
@ -49,7 +49,7 @@ namespace osu.Game.Graphics.UserInterface
}
/// <summary>
/// The icon scale. This does not affect <see cref="IconButton.Scale"/>.
/// The icon scale. This does not affect <see cref="Drawable.Scale">Scale</see>.
/// </summary>
public Vector2 IconScale
{

View File

@ -32,7 +32,7 @@ namespace osu.Game.Graphics.UserInterface
protected virtual float StripHeight() => 1;
/// <summary>
/// Whether entries should be automatically populated if <see cref="T"/> is an <see cref="Enum"/> type.
/// Whether entries should be automatically populated if <typeparamref name="T"/> is an <see cref="Enum"/> type.
/// </summary>
protected virtual bool AddEnumEntriesAutomatically => true;