From c2ea2bb5b075f0d6f760970f9ed284a484b8c9ba Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Fri, 19 May 2017 19:13:07 -0300
Subject: [PATCH] Proper search tab changing logic

---
 osu.Game/Overlays/DirectOverlay.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/DirectOverlay.cs b/osu.Game/Overlays/DirectOverlay.cs
index 5dcad5e8d0..81aa6b2ff5 100644
--- a/osu.Game/Overlays/DirectOverlay.cs
+++ b/osu.Game/Overlays/DirectOverlay.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Overlays
         private readonly float panel_padding = 10f;
 
         private readonly Box background;
+        private readonly Header header;
         private readonly FilterControl filter;
         private readonly FillFlowContainer<DirectPanel> panels;
 
@@ -104,13 +105,16 @@ namespace osu.Game.Overlays
                         },
                     },
                 },
-                new Header
+                header = new Header
                 {
                     RelativeSizeAxes = Axes.X,
                 },
             };
 
+            header.Tabs.Current.ValueChanged += (tab) => { if (tab != DirectTab.Search) filter.Search.Current.Value = @""; };
+
             filter.Search.Exit = Hide;
+            filter.Search.Current.ValueChanged += (s) => { if (s != @"") header.Tabs.Current.Value = DirectTab.Search; };
             filter.DisplayStyle.ValueChanged += recreatePanels;
         }
 
@@ -140,13 +144,13 @@ namespace osu.Game.Overlays
             filter.Search.HoldFocus = false;
         }
 
-        private class ContentFlow : FillFlowContainer<Drawable>
+        private class ContentFlow : FillFlowContainer<Drawable>
         {
-            protected override IComparer<Drawable> DepthComparer => new ReverseCreationOrderDepthComparer();
+            protected override IComparer<Drawable> DepthComparer => new ReverseCreationOrderDepthComparer();
             protected override IEnumerable<Drawable> FlowingChildren => base.FlowingChildren.Reverse();
 
             public ContentFlow()
-            {
+            {
                 Direction = FillDirection.Vertical;
             }
         }