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

Fix volume meter requesting focus for any action

Browse Source
This commit is contained in:
Derrick Timmermans
2021-07-04 17:19:44 +02:00
parent 14a861003a
commit 69803105ef
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,8 +27,6 @@ namespace osu.Game.Overlays.Volume
{ {
public class VolumeMeter : Container, IKeyBindingHandler<GlobalAction> public class VolumeMeter : Container, IKeyBindingHandler<GlobalAction>
{ {
private bool isFocused = true;
private CircularProgress volumeCircle; private CircularProgress volumeCircle;
private CircularProgress volumeCircleGlow; private CircularProgress volumeCircleGlow;
@ -316,13 +314,11 @@ namespace osu.Game.Overlays.Volume
public void Focus() public void Focus()
{ {
isFocused = true;
this.ScaleTo(1.04f, transition_length, Easing.OutExpo); this.ScaleTo(1.04f, transition_length, Easing.OutExpo);
} }
public void Unfocus() public void Unfocus()
{ {
isFocused = false;
this.ScaleTo(1f, transition_length, Easing.OutExpo); this.ScaleTo(1f, transition_length, Easing.OutExpo);
} }
@ -341,17 +337,15 @@ namespace osu.Game.Overlays.Volume
if (!IsHovered) if (!IsHovered)
return false; return false;
// Grab back focus is UP/DOWN input is directed at this meter
if (!isFocused)
RequestFocus?.Invoke(this);
switch (action) switch (action)
{ {
case GlobalAction.SelectPrevious: case GlobalAction.SelectPrevious:
RequestFocus?.Invoke(this);
adjust(1, false); adjust(1, false);
return true; return true;
case GlobalAction.SelectNext: case GlobalAction.SelectNext:
RequestFocus?.Invoke(this);
adjust(-1, false); adjust(-1, false);
return true; return true;
} }