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

Change method structure for hover/unhover state setting (shouldn't be called "Fade")

Browse Source
This commit is contained in:
Dean Herbert
2020-07-30 13:49:04 +09:00
parent ed699ae913
commit e5991d6e14
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Graphics/UserInterface/ShowMoreButton.cs
View File

@ -98,16 +98,16 @@ namespace osu.Game.Graphics.UserInterface
protected override bool OnHover(HoverEvent e) protected override bool OnHover(HoverEvent e)
{ {
base.OnHover(e); base.OnHover(e);
leftIcon.FadeHoverColour(); leftIcon.SetHoveredState(true);
rightIcon.FadeHoverColour(); rightIcon.SetHoveredState(true);
return true; return true;
} }
protected override void OnHoverLost(HoverLostEvent e) protected override void OnHoverLost(HoverLostEvent e)
{ {
base.OnHoverLost(e); base.OnHoverLost(e);
leftIcon.FadeIdleColour(); leftIcon.SetHoveredState(false);
rightIcon.FadeIdleColour(); rightIcon.SetHoveredState(false);
} }
public class ChevronIcon : SpriteIcon public class ChevronIcon : SpriteIcon
@ -127,9 +127,8 @@ namespace osu.Game.Graphics.UserInterface
Colour = colourProvider.Foreground1; Colour = colourProvider.Foreground1;
} }
public void FadeHoverColour() => this.FadeColour(colourProvider.Light1, 200, Easing.OutQuint); public void SetHoveredState(bool hovered) =>
this.FadeColour(hovered ? colourProvider.Light1 : colourProvider.Foreground1, 200, Easing.OutQuint);
public void FadeIdleColour() => this.FadeColour(colourProvider.Foreground1, 200, Easing.OutQuint);
} }
} }
} }

4
osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
View File

@ -96,7 +96,7 @@ namespace osu.Game.Overlays.Comments.Buttons
{ {
base.OnHover(e); base.OnHover(e);
background.FadeColour(colourProvider.Background1, 200, Easing.OutQuint); background.FadeColour(colourProvider.Background1, 200, Easing.OutQuint);
icon.FadeHoverColour(); icon.SetHoveredState(true);
return true; return true;
} }
@ -104,7 +104,7 @@ namespace osu.Game.Overlays.Comments.Buttons
{ {
base.OnHoverLost(e); base.OnHoverLost(e);
background.FadeColour(colourProvider.Background2, 200, Easing.OutQuint); background.FadeColour(colourProvider.Background2, 200, Easing.OutQuint);
icon.FadeIdleColour(); icon.SetHoveredState(false);
} }
} }
} }