h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 19:22:54 +08:00
Code Issues Releases Wiki Activity

Merge pull request #10185 from Joehuu/fix-hovered-channel-tabs-color-when-unselected

Browse Source 
Fix hovered tab items not showing hover state when deselected
This commit is contained in:
Dan Balasescu 2020-09-18 16:15:27 +09:00 committed by GitHub
commit 72a173d4fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Graphics/UserInterface/OsuTabControl.cs
View File

@ -123,8 +123,8 @@ namespace osu.Game.Graphics.UserInterface
protected void FadeUnhovered() protected void FadeUnhovered()
{ {
Bar.FadeOut(transition_length, Easing.OutQuint); Bar.FadeTo(IsHovered ? 1 : 0, transition_length, Easing.OutQuint);
Text.FadeColour(AccentColour, transition_length, Easing.OutQuint); Text.FadeColour(IsHovered ? Color4.White : AccentColour, transition_length, Easing.OutQuint);
} }
protected override bool OnHover(HoverEvent e) protected override bool OnHover(HoverEvent e)

2
osu.Game/Overlays/Chat/Tabs/ChannelTabItem.cs
View File

@ -211,7 +211,7 @@ namespace osu.Game.Overlays.Chat.Tabs
TweenEdgeEffectTo(deactivateEdgeEffect, TRANSITION_LENGTH); TweenEdgeEffectTo(deactivateEdgeEffect, TRANSITION_LENGTH);
box.FadeColour(BackgroundInactive, TRANSITION_LENGTH, Easing.OutQuint); box.FadeColour(IsHovered ? backgroundHover : BackgroundInactive, TRANSITION_LENGTH, Easing.OutQuint);
highlightBox.FadeOut(TRANSITION_LENGTH, Easing.OutQuint); highlightBox.FadeOut(TRANSITION_LENGTH, Easing.OutQuint);
Text.Font = Text.Font.With(weight: FontWeight.Medium); Text.Font = Text.Font.With(weight: FontWeight.Medium);