Merge branch 'master' into zoomablescrollcontainer-fix

This commit is contained in:
Dan Balasescu
2019-05-09 13:54:21 +09:00
committed by GitHub
242 changed files with 1186 additions and 161 deletions

View File

@ -236,10 +236,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
beatDivisor.Next();
OnUserChange(Current.Value);
return true;
case Key.Left:
beatDivisor.Previous();
OnUserChange(Current.Value);
return true;
default:
return false;
}
@ -307,18 +309,25 @@ namespace osu.Game.Screens.Edit.Compose.Components
{
case 2:
return colours.BlueLight;
case 4:
return colours.Blue;
case 8:
return colours.BlueDarker;
case 16:
return colours.PurpleDark;
case 3:
return colours.YellowLight;
case 6:
return colours.Yellow;
case 12:
return colours.YellowDarker;
default:
return Color4.White;
}