sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-06 08:03:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

Adjust colours and spacing

Browse Source
This commit is contained in:
Dean Herbert
2018-03-20 21:59:32 +09:00
parent dac1ba21db
commit aa8b0d017c
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game/Screens/Edit/Screens/Compose/BeatDivisorControl.cs
View File

@ -1,9 +1,11 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Configuration; using osu.Framework.Configuration;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour; using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
@ -219,6 +221,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose
protected override void UpdateValue(float value) protected override void UpdateValue(float value)
{ {
} }
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
@ -256,7 +259,8 @@ namespace osu.Game.Screens.Edit.Screens.Compose
OnUserChange(); OnUserChange();
} }
private float getTickPosition(float divisor) => (divisor - 1) / availableDivisors.Last(); private float getTickPosition(float divisor) => (float)Math.Pow((divisor - 1) / availableDivisors.Last(), 0.90f);
private class Tick : CompositeDrawable private class Tick : CompositeDrawable
{ {
@ -276,12 +280,18 @@ namespace osu.Game.Screens.Edit.Screens.Compose
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
Color4 colour;
if (divisor >= 16) if (divisor >= 16)
Colour = colours.Red; colour = colours.Red;
else if (divisor >= 8) else if (divisor >= 12)
Colour = colours.Yellow; colour = colours.YellowDarker;
else if (divisor % 3 == 0)
colour = colours.Yellow;
else else
Colour = OsuColour.Gray(2f / divisor); colour = Color4.White;
s Colour = colour.Opacity((float)Math.Pow(0.98f, divisor * 1.2f));
} }
} }