sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18962 from peppy/slider-range-control

Browse Source 
Move star difficulty filter to song select
This commit is contained in:
Dan Balasescu
2022-07-03 21:58:00 +09:00
committed by GitHub
parent 385bd5a1b2 724fd19038
commit 9bf91835b6
6 changed files with 181 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game/Graphics/UserInterface/OsuSliderBar.cs
View File

@ -38,8 +38,8 @@ namespace osu.Game.Graphics.UserInterface
private T lastSampleValue;
protected readonly Nub Nub;
private readonly Box leftBox;
private readonly Box rightBox;
protected readonly Box LeftBox;
protected readonly Box RightBox;
private readonly Container nubContainer;
public virtual LocalisableString TooltipText { get; private set; }
@ -57,7 +57,7 @@ namespace osu.Game.Graphics.UserInterface
set
{
accentColour = value;
leftBox.Colour = value;
LeftBox.Colour = value;
}
}
@ -69,7 +69,7 @@ namespace osu.Game.Graphics.UserInterface
set
{
backgroundColour = value;
rightBox.Colour = value;
RightBox.Colour = value;
}
}
@ -96,7 +96,7 @@ namespace osu.Game.Graphics.UserInterface
CornerRadius = 5f,
Children = new Drawable[]
{
leftBox = new Box
LeftBox = new Box
{
Height = 5,
EdgeSmoothness = new Vector2(0, 0.5f),
@ -104,14 +104,13 @@ namespace osu.Game.Graphics.UserInterface
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
},
rightBox = new Box
RightBox = new Box
{
Height = 5,
EdgeSmoothness = new Vector2(0, 0.5f),
RelativeSizeAxes = Axes.None,
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
Alpha = 0.5f,
},
},
},
@ -137,7 +136,7 @@ namespace osu.Game.Graphics.UserInterface
{
sample = audio.Samples.Get(@"UI/notch-tick");
AccentColour = colourProvider?.Highlight1 ?? colours.Pink;
BackgroundColour = colourProvider?.Background5 ?? colours.Pink.Opacity(0.5f);
BackgroundColour = colourProvider?.Background5 ?? colours.PinkDarker.Darken(1);
}
protected override void Update()
@ -229,9 +228,9 @@ namespace osu.Game.Graphics.UserInterface
protected override void UpdateAfterChildren()
{
base.UpdateAfterChildren();
leftBox.Scale = new Vector2(Math.Clamp(
LeftBox.Scale = new Vector2(Math.Clamp(
RangePadding + Nub.DrawPosition.X - Nub.DrawWidth / 2, 0, DrawWidth), 1);
rightBox.Scale = new Vector2(Math.Clamp(
RightBox.Scale = new Vector2(Math.Clamp(
DrawWidth - Nub.DrawPosition.X - RangePadding - Nub.DrawWidth / 2, 0, DrawWidth), 1);
}