From 21e900df73bd3f0de111b18962d7b826f8235431 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Fri, 26 May 2017 03:46:50 -0300
Subject: [PATCH] Transition code cleanup

---
 osu.Game/Overlays/Chat/ChannelListItem.cs | 18 ++++++++++++++----
 osu.Game/Overlays/Chat/ChannelSection.cs  | 11 +++++------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/Chat/ChannelListItem.cs b/osu.Game/Overlays/Chat/ChannelListItem.cs
index cc9aacc643..fe058e131a 100644
--- a/osu.Game/Overlays/Chat/ChannelListItem.cs
+++ b/osu.Game/Overlays/Chat/ChannelListItem.cs
@@ -164,10 +164,20 @@ namespace osu.Game.Overlays.Chat
 
         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);
+            }
         }
     }
 }
diff --git a/osu.Game/Overlays/Chat/ChannelSection.cs b/osu.Game/Overlays/Chat/ChannelSection.cs
index 60fabdf187..4fe705e0e0 100644
--- a/osu.Game/Overlays/Chat/ChannelSection.cs
+++ b/osu.Game/Overlays/Chat/ChannelSection.cs
@@ -17,12 +17,12 @@ namespace osu.Game.Overlays.Chat
 
         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 @@ namespace osu.Game.Overlays.Chat
             set { ChannelFlow.Children = value.Select(c => new ChannelListItem { Channel = c }); }
         }
 
-
         public ChannelSection()
         {
             RelativeSizeAxes = Axes.X;