sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-05 05:37:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

Adjust visuals and make base opacity 100%

Browse Source
This commit is contained in:
Dean Herbert 2021-07-07 21:02:48 +09:00
parent 83283a706e
commit cbe4114e90
1 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
osu.Game/Overlays/Volume/VolumeMeter.cs
View File

@ -40,7 +40,7 @@ namespace osu.Game.Overlays.Volume
private OsuSpriteText text; private OsuSpriteText text;
private BufferedContainer maxGlow; private BufferedContainer maxGlow;
private Container focusGlowContainer; private Container selectedGlowContainer;
private Sample sample; private Sample sample;
private double sampleLastPlaybackTime; private double sampleLastPlaybackTime;
@ -59,6 +59,8 @@ namespace osu.Game.Overlays.Volume
state = value; state = value;
StateChanged?.Invoke(value); StateChanged?.Invoke(value);
updateSelectedState();
} }
} }
@ -94,28 +96,8 @@ namespace osu.Game.Overlays.Volume
Size = new Vector2(circleSize), Size = new Vector2(circleSize),
Children = new Drawable[] Children = new Drawable[]
{ {
focusGlowContainer = new CircularContainer
{
Masking = true,
RelativeSizeAxes = Axes.Both,
Alpha = 0,
Child = new Box
{
RelativeSizeAxes = Axes.Both,
Alpha = 0,
AlwaysPresent = true,
},
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Glow,
Colour = meterColour.Opacity(0.5f),
Radius = 5,
Hollow = true,
}
},
new BufferedContainer new BufferedContainer
{ {
Alpha = 0.9f,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Children = new Drawable[] Children = new Drawable[]
{ {
@ -187,6 +169,24 @@ namespace osu.Game.Overlays.Volume
}, },
}, },
}, },
selectedGlowContainer = new CircularContainer
{
Masking = true,
RelativeSizeAxes = Axes.Both,
Alpha = 0,
Child = new Box
{
RelativeSizeAxes = Axes.Both,
Alpha = 0,
AlwaysPresent = true,
},
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Glow,
Colour = meterColour.Opacity(0.1f),
Radius = 10,
}
},
maxGlow = (text = new OsuSpriteText maxGlow = (text = new OsuSpriteText
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
@ -211,7 +211,6 @@ namespace osu.Game.Overlays.Volume
{ {
new Box new Box
{ {
Alpha = 0.9f,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = backgroundColour, Colour = backgroundColour,
}, },
@ -229,8 +228,6 @@ namespace osu.Game.Overlays.Volume
Bindable.BindValueChanged(volume => { this.TransformTo(nameof(DisplayVolume), volume.NewValue, 400, Easing.OutQuint); }, true); Bindable.BindValueChanged(volume => { this.TransformTo(nameof(DisplayVolume), volume.NewValue, 400, Easing.OutQuint); }, true);
bgProgress.Current.Value = 0.75f; bgProgress.Current.Value = 0.75f;
StateChanged += stateChanged;
} }
private int? displayVolumeInt; private int? displayVolumeInt;
@ -359,20 +356,6 @@ namespace osu.Game.Overlays.Volume
{ {
} }
private void stateChanged(SelectionState newState)
{
if (newState == SelectionState.Selected)
{
this.ScaleTo(1.04f, transition_length, Easing.OutExpo);
focusGlowContainer.FadeIn(transition_length, Easing.OutExpo);
}
else
{
this.ScaleTo(1f, transition_length, Easing.OutExpo);
focusGlowContainer.FadeOut(transition_length, Easing.OutExpo);
}
}
public bool OnPressed(GlobalAction action) public bool OnPressed(GlobalAction action)
{ {
if (!IsHovered) if (!IsHovered)
@ -397,5 +380,21 @@ namespace osu.Game.Overlays.Volume
public void OnReleased(GlobalAction action) public void OnReleased(GlobalAction action)
{ {
} }
private void updateSelectedState()
{
switch (state)
{
case SelectionState.Selected:
this.ScaleTo(1.04f, transition_length, Easing.OutExpo);
selectedGlowContainer.FadeIn(transition_length, Easing.OutExpo);
break;
case SelectionState.NotSelected:
this.ScaleTo(1f, transition_length, Easing.OutExpo);
selectedGlowContainer.FadeOut(transition_length, Easing.OutExpo);
break;
}
}
} }
} }