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

Let VolumeMeter request focus instead of taking it

Browse Source
This commit is contained in:
Derrick Timmermans
2021-07-04 15:31:43 +02:00
parent d1553f0864
commit e151c7ffd0
2 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,6 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Effects;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Transforms;
using osu.Framework.Graphics.UserInterface;
using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events;
@ -28,10 +27,7 @@ namespace osu.Game.Overlays.Volume
{
public class VolumeMeter : Container, IKeyBindingHandler<GlobalAction>
{
[Resolved(canBeNull: true)]
private Bindable<VolumeMeter> focusedMeter { get; set; }
private bool isFocused => focusedMeter == null || focusedMeter.Value == this;
private bool isFocused = true;
private CircularProgress volumeCircle;
private CircularProgress volumeCircleGlow;
@ -320,20 +316,19 @@ namespace osu.Game.Overlays.Volume
public void Focus()
{
if (focusedMeter != null)
focusedMeter.Value = this;
isFocused = true;
this.ScaleTo(1.04f, transition_length, Easing.OutExpo);
}
public void Unfocus()
{
isFocused = false;
this.ScaleTo(1f, transition_length, Easing.OutExpo);
}
protected override bool OnHover(HoverEvent e)
{
Focus();
RequestFocus?.Invoke(this);
return false;
}