h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 03:23:02 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fix-import-tests-waiting

Browse Source
This commit is contained in:
Dean Herbert 2020-09-18 17:45:51 +09:00
commit 8e767729a2
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()
{
Bar.FadeOut(transition_length, Easing.OutQuint);
Text.FadeColour(AccentColour, transition_length, Easing.OutQuint);
Bar.FadeTo(IsHovered ? 1 : 0, transition_length, Easing.OutQuint);
Text.FadeColour(IsHovered ? Color4.White : AccentColour, transition_length, Easing.OutQuint);
}
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);
box.FadeColour(BackgroundInactive, TRANSITION_LENGTH, Easing.OutQuint);
box.FadeColour(IsHovered ? backgroundHover : BackgroundInactive, TRANSITION_LENGTH, Easing.OutQuint);
highlightBox.FadeOut(TRANSITION_LENGTH, Easing.OutQuint);
Text.Font = Text.Font.With(weight: FontWeight.Medium);