h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 00:47:24 +08:00
Code Issues Releases Wiki Activity

Fixes for keyboard handling and general code quality

Browse Source
This commit is contained in:
Dean Herbert 2018-03-20 22:25:15 +09:00
parent aa8b0d017c
commit 8ac660b0c6
2 changed files with 35 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using OpenTK;
using OpenTK.Graphics;
using OpenTK.Input;
namespace osu.Game.Screens.Edit.Screens.Compose
{
@ -24,8 +25,6 @@ namespace osu.Game.Screens.Edit.Screens.Compose
{
private readonly BindableBeatDivisor beatDivisor = new BindableBeatDivisor();
private int currentDivisorIndex;
private TickSliderBar slider;
public BeatDivisorControl(BindableBeatDivisor beatDivisor)
{
this.beatDivisor.BindTo(beatDivisor);
@ -52,10 +51,9 @@ namespace osu.Game.Screens.Edit.Screens.Compose
{
new Drawable[]
{
slider = new TickSliderBar(beatDivisor, 1, 2, 3, 4, 6, 8, 12, 16)
new TickSliderBar(beatDivisor, 1, 2, 3, 4, 6, 8, 12, 16)
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Horizontal = 5 }
}
},
new Drawable[]
@ -122,8 +120,6 @@ namespace osu.Game.Screens.Edit.Screens.Compose
}
}
};
slider.Current.BindTo(beatDivisor);
}
private class DivisorText : SpriteText
@ -180,18 +176,17 @@ namespace osu.Game.Screens.Edit.Screens.Compose
private class TickSliderBar : SliderBar<int>
{
public new MarginPadding Padding
{
set => base.Padding = value;
}
private Marker marker;
private readonly BindableBeatDivisor beatDivisor;
private readonly int[] availableDivisors;
public TickSliderBar(params int[] divisors)
public TickSliderBar(BindableBeatDivisor beatDivisor, params int[] divisors)
{
CurrentNumber.BindTo(this.beatDivisor = beatDivisor);
availableDivisors = divisors;
Padding = new MarginPadding { Horizontal = 5 };
}
[BackgroundDependencyLoader]
@ -204,7 +199,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose
Anchor = Anchor.TopLeft,
Origin = Anchor.TopCentre,
RelativePositionAxes = Axes.X,
X = getTickPosition(t)
X = getMappedPosition(t)
});
}
@ -212,16 +207,33 @@ namespace osu.Game.Screens.Edit.Screens.Compose
CurrentNumber.ValueChanged += v =>
{
marker.MoveToX(getTickPosition(v), 100, Easing.OutQuint);
marker.MoveToX(getMappedPosition(v), 100, Easing.OutQuint);
marker.Flash();
KeyboardStep = v / 3f;
};
}
protected override void UpdateValue(float value)
{
}
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
{
if (!IsHovered || CurrentNumber.Disabled)
return false;
switch (args.Key)
{
case Key.Right:
beatDivisor.Next();
OnUserChange();
return true;
case Key.Left:
beatDivisor.Previous();
OnUserChange();
return true;
default:
return false;
}
}
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
@ -251,16 +263,13 @@ namespace osu.Game.Screens.Edit.Screens.Compose
private void handleMouseInput(InputState state)
{
// copied from SliderBar so we can do custom spacing logic.
var xPosition = ToLocalSpace(state?.Mouse.NativeState.Position ?? Vector2.Zero).X - RangePadding;
if (!CurrentNumber.Disabled)
CurrentNumber.SetProportional(xPosition / UsableWidth, state != null && state.Keyboard.ShiftPressed ? KeyboardStep : 0);
var xPosition = (ToLocalSpace(state?.Mouse.NativeState.Position ?? Vector2.Zero).X - RangePadding) / UsableWidth;
CurrentNumber.Value = availableDivisors.OrderBy(d => Math.Abs(getMappedPosition(d) - xPosition)).First();
OnUserChange();
}
private float getTickPosition(float divisor) => (float)Math.Pow((divisor - 1) / availableDivisors.Last(), 0.90f);
private float getMappedPosition(float divisor) => (float)Math.Pow((divisor - 1) / (availableDivisors.Last() - 1), 0.90f);
private class Tick : CompositeDrawable
{
@ -291,7 +300,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose
else
colour = Color4.White;
s Colour = colour.Opacity((float)Math.Pow(0.98f, divisor * 1.2f));
Colour = colour.Opacity((float)Math.Pow(0.98f, divisor * 1.2f));
}
}

22
osu.Game/Screens/Edit/Screens/Compose/BindableBeatDivisor.cs
View File

@ -25,26 +25,10 @@ namespace osu.Game.Screens.Edit.Screens.Compose
get { return base.Value; }
set
{
int snapped = 1;
if (!VALID_DIVISORS.Contains(value))
throw new ArgumentOutOfRangeException($"Provided divisor is not in {nameof(VALID_DIVISORS)}");
for (int i = 1; i < VALID_DIVISORS.Length; i++)
{
var curr = VALID_DIVISORS[i];
var prev = VALID_DIVISORS[i - 1];
if (value < prev + (curr - prev) / 2f)
{
snapped = prev;
break;
}
snapped = curr;
}
if (snapped == Value)
// it may be that we are already at the snapped value, but we want bound components to still be made aware that we possibly modified an incoming ValueChanged.
TriggerValueChange();
else
base.Value = snapped;
base.Value = value;
}
}