RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Transition code cleanup

This commit is contained in:
DrabWeb 2017-05-26 03:46:50 -03:00
parent d29ebb139f
commit 21e900df73
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Overlays/Chat/ChannelListItem.cs
View File

@ -164,10 +164,20 @@ protected override void Dispose(bool isDisposing)
private void updateColour(bool joined)
{
joinedCheckmark.FadeTo(joined ? 1f : 0f, transition_duration);
topic.FadeTo(joined ? 0.8f : 1f, transition_duration);
topic.FadeColour(joined ? Color4.White : topicColour ?? Color4.White, transition_duration);
FadeColour(joined ? joinedColour ?? Color4.White : Color4.White, transition_duration);
if (joined)
{
joinedCheckmark.FadeTo(1f, transition_duration);
topic.FadeTo(0.8f, transition_duration);
topic.FadeColour(Color4.White, transition_duration);
FadeColour(joinedColour ?? Color4.White, transition_duration);
}
else
{
joinedCheckmark.FadeTo(0f, transition_duration);
topic.FadeTo(1f, transition_duration);
topic.FadeColour(topicColour ?? Color4.White, transition_duration);
FadeColour(Color4.White, transition_duration);
}
}
}
}

11
osu.Game/Overlays/Chat/ChannelSection.cs
View File

@ -17,12 +17,12 @@ public class ChannelSection : Container, IHasFilterableChildren
public readonly FillFlowContainer<ChannelListItem> ChannelFlow;
public IEnumerable<IFilterable> FilterableChildren => ChannelFlow.Children.OfType<ChannelListItem>();
public string[] FilterTerms => new[] { Header };
public bool MatchingCurrentFilter
{
public IEnumerable<IFilterable> FilterableChildren => ChannelFlow.Children.OfType<ChannelListItem>();
public string[] FilterTerms => new[] { Header };
public bool MatchingCurrentFilter
{
set
{
{
FadeTo(value ? 1f : 0f, 100);
}
}
@ -38,7 +38,6 @@ public IEnumerable<Channel> Channels
set { ChannelFlow.Children = value.Select(c => new ChannelListItem { Channel = c }); }
}
public ChannelSection()
{
RelativeSizeAxes = Axes.X;