From ab1401054def81a03a247f7f2509c071f18b1c63 Mon Sep 17 00:00:00 2001 From: DrabWeb Date: Thu, 18 May 2017 14:08:14 -0300 Subject: [PATCH] Added result counts (visually) --- osu.Game/Overlays/Direct/FilterControl.cs | 56 ++++++++++++++++------- osu.Game/Overlays/Direct/Header.cs | 2 +- 2 files changed, 41 insertions(+), 17 deletions(-) diff --git a/osu.Game/Overlays/Direct/FilterControl.cs b/osu.Game/Overlays/Direct/FilterControl.cs index 78c9a37edf..d4b643c272 100644 --- a/osu.Game/Overlays/Direct/FilterControl.cs +++ b/osu.Game/Overlays/Direct/FilterControl.cs @@ -13,6 +13,7 @@ using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.UserInterface; using osu.Game.Database; using osu.Game.Graphics; +using osu.Game.Graphics.Sprites; using osu.Game.Graphics.UserInterface; using Container = osu.Framework.Graphics.Containers.Container; @@ -23,6 +24,7 @@ namespace osu.Game.Overlays.Direct { private readonly Box tabStrip; private readonly FillFlowContainer modeButtons; + private FillFlowContainer resultCounts; public readonly SearchTextBox Search; public readonly SortTabControl SortTabs; @@ -53,8 +55,8 @@ namespace osu.Game.Overlays.Direct { RelativeSizeAxes = Axes.X, AutoSizeAxes = Axes.Y, - Padding = new MarginPadding { Left = DirectOverlay.WIDTH_PADDING, Right = DirectOverlay.WIDTH_PADDING, Top = 10 }, Spacing = new Vector2(0f, 10f), + Padding = new MarginPadding { Left = DirectOverlay.WIDTH_PADDING, Right = DirectOverlay.WIDTH_PADDING, Top = 10 }, Children = new Drawable[] { Search = new DirectSearchTextBox @@ -80,11 +82,32 @@ namespace osu.Game.Overlays.Direct Margin = new MarginPadding { Bottom = 5, Right = DirectOverlay.WIDTH_PADDING }, Width = 160f, }, + resultCounts = new FillFlowContainer + { + Anchor = Anchor.BottomLeft, + Origin = Anchor.TopLeft, + AutoSizeAxes = Axes.Both, + Direction = FillDirection.Horizontal, + Margin = new MarginPadding { Left = DirectOverlay.WIDTH_PADDING, Top = 6 }, + Children = new Drawable[] + { + new OsuSpriteText + { + Text = @"Found ", + TextSize = 15, + }, + new OsuSpriteText + { + Text = @"1 Artist, 432 Songs, 3 Tags", + TextSize = 15, + Font = @"Exo2.0-Bold", + }, + } + }, }; - RankStatusDropdown.Current.Value = RankStatus.RankedApproved; - //todo: possibly restore from config instead of always title + RankStatusDropdown.Current.Value = RankStatus.RankedApproved; SortTabs.Current.Value = SortCriteria.Title; SortTabs.Current.TriggerChange(); } @@ -93,6 +116,7 @@ namespace osu.Game.Overlays.Direct private void load(OsuGame game, RulesetDatabase rulesets, OsuColour colours) { tabStrip.Colour = colours.Yellow; + resultCounts.Colour = colours.Yellow; RankStatusDropdown.AccentColour = colours.BlueDark; foreach (var r in rulesets.AllRulesets) @@ -197,19 +221,19 @@ namespace osu.Game.Overlays.Direct } } - public enum RankStatus - { - Any, - [Description("Ranked & Approved")] - RankedApproved, - Approved, - Loved, - Favourites, - [Description("Mod Requests")] - ModRequests, - Pending, - Graveyard, - [Description("My Maps")] + public enum RankStatus + { + Any, + [Description("Ranked & Approved")] + RankedApproved, + Approved, + Loved, + Favourites, + [Description("Mod Requests")] + ModRequests, + Pending, + Graveyard, + [Description("My Maps")] MyMaps, } } diff --git a/osu.Game/Overlays/Direct/Header.cs b/osu.Game/Overlays/Direct/Header.cs index 0cd118a8ba..3e3bfe98d8 100644 --- a/osu.Game/Overlays/Direct/Header.cs +++ b/osu.Game/Overlays/Direct/Header.cs @@ -80,7 +80,7 @@ namespace osu.Game.Overlays.Direct }, }; - //todo: possibly restore from config instead of always search + //todo: possibly restore from config instead Tabs.Current.Value = DirectTab.Search; Tabs.Current.TriggerChange(); }