sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-08 00:53:56 +09:00
Code Issues Packages Projects Releases Wiki Activity

Rename FilterSongSelect, use OsuColour

Browse Source
This commit is contained in:
Drew DeVault
2017-01-17 16:43:40 -05:00
parent 63031fbc3d
commit 5eb1cda77b
3 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
osu.Game/Screens/Select/FilterSongSelect.cs → osu.Game/Screens/Select/FilterControl.cs
View File

@ -1,6 +1,7 @@
using System; using System;
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Primitives;
@ -11,7 +12,7 @@ using osu.Game.Graphics;
namespace osu.Game.Screens.Select namespace osu.Game.Screens.Select
{ {
public class FilterSongSelect : Container public class FilterControl : Container
{ {
public enum SortMode public enum SortMode
{ {
@ -48,7 +49,7 @@ namespace osu.Game.Screens.Select
public string Search { get; private set; } = string.Empty; public string Search { get; private set; } = string.Empty;
public SortMode Sort { get; private set; } = SortMode.Title; public SortMode Sort { get; private set; } = SortMode.Title;
public FilterSongSelect() public FilterControl()
{ {
AutoSizeAxes = Axes.Y; AutoSizeAxes = Axes.Y;
@ -78,7 +79,7 @@ namespace osu.Game.Screens.Select
}; };
} }
private class GroupSortItem : ClickableContainer private class TabItem : ClickableContainer
{ {
public string Text public string Text
{ {
@ -95,7 +96,7 @@ namespace osu.Game.Screens.Select
private void FadeInactive() private void FadeInactive()
{ {
box.FadeOut(300); box.FadeOut(300);
text.FadeColour(new Color4(102, 204, 255, 255), 300); text.FadeColour(fadeColour, 300);
} }
private bool active; private bool active;
@ -114,6 +115,7 @@ namespace osu.Game.Screens.Select
private SpriteText text; private SpriteText text;
private Box box; private Box box;
private Color4 fadeColour;
protected override bool OnHover(InputState state) protected override bool OnHover(InputState state)
{ {
@ -128,14 +130,13 @@ namespace osu.Game.Screens.Select
FadeInactive(); FadeInactive();
} }
public GroupSortItem() public TabItem()
{ {
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
Children = new Drawable[] Children = new Drawable[]
{ {
text = new SpriteText text = new SpriteText
{ {
Colour = new Color4(102, 204, 255, 255),
Margin = new MarginPadding(5), Margin = new MarginPadding(5),
TextSize = 14, TextSize = 14,
Font = @"Exo2.0-Bold", Font = @"Exo2.0-Bold",
@ -151,10 +152,20 @@ namespace osu.Game.Screens.Select
} }
}; };
} }
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
text.Colour = colours.Blue;
fadeColour = colours.Blue;
}
} }
private class GroupSortTabs : Container private class GroupSortTabs : Container
{ {
private TextAwesome groupsEllipsis, sortEllipsis;
private SpriteText sortLabel;
public GroupSortTabs() public GroupSortTabs()
{ {
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
@ -165,7 +176,7 @@ namespace osu.Game.Screens.Select
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Height = 1, Height = 1,
Colour = new Color4(80, 80, 80, 255), Colour = OsuColour.Gray(80),
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
}, },
@ -176,25 +187,24 @@ namespace osu.Game.Screens.Select
Spacing = new Vector2(10, 0), Spacing = new Vector2(10, 0),
Children = new Drawable[] Children = new Drawable[]
{ {
new GroupSortItem new TabItem
{ {
Text = "All", Text = "All",
Active = true, Active = true,
}, },
new GroupSortItem new TabItem
{ {
Text = "Recently Played", Text = "Recently Played",
Active = false, Active = false,
}, },
new GroupSortItem new TabItem
{ {
Text = "Collections", Text = "Collections",
Active = false, Active = false,
}, },
new TextAwesome groupsEllipsis = new TextAwesome
{ {
Icon = FontAwesome.fa_ellipsis_h, Icon = FontAwesome.fa_ellipsis_h,
Colour = new Color4(102, 204, 255, 255),
TextSize = 14, TextSize = 14,
Margin = new MarginPadding { Top = 5, Bottom = 5 }, Margin = new MarginPadding { Top = 5, Bottom = 5 },
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
@ -211,7 +221,7 @@ namespace osu.Game.Screens.Select
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Children = new Drawable[] Children = new Drawable[]
{ {
new SpriteText sortLabel = new SpriteText
{ {
Font = @"Exo2.0-Bold", Font = @"Exo2.0-Bold",
Text = "Sort results by", Text = "Sort results by",
@ -219,12 +229,12 @@ namespace osu.Game.Screens.Select
TextSize = 14, TextSize = 14,
Margin = new MarginPadding { Top = 5, Bottom = 5 }, Margin = new MarginPadding { Top = 5, Bottom = 5 },
}, },
new GroupSortItem new TabItem
{ {
Text = "Artist", Text = "Artist",
Active = true, Active = true,
}, },
new TextAwesome sortEllipsis = new TextAwesome
{ {
Icon = FontAwesome.fa_ellipsis_h, Icon = FontAwesome.fa_ellipsis_h,
Colour = new Color4(165, 204, 0, 255), Colour = new Color4(165, 204, 0, 255),
@ -237,6 +247,12 @@ namespace osu.Game.Screens.Select
}, },
}; };
} }
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
groupsEllipsis.Colour = colours.Blue;
}
} }
} }
} }

2
osu.Game/Screens/Select/PlaySongSelect.cs
View File

@ -134,7 +134,7 @@ namespace osu.Game.Screens.Select
Anchor = Anchor.CentreRight, Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight, Origin = Anchor.CentreRight,
}, },
new FilterSongSelect new FilterControl
{ {
Position = wedged_container_start_position, Position = wedged_container_start_position,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,

2
osu.Game/osu.Game.csproj
View File

@ -232,7 +232,7 @@
<Compile Include="Configuration\FrameSync.cs" /> <Compile Include="Configuration\FrameSync.cs" />
<Compile Include="Configuration\ConfineMouseMode.cs" /> <Compile Include="Configuration\ConfineMouseMode.cs" />
<Compile Include="Graphics\OsuColour.cs" /> <Compile Include="Graphics\OsuColour.cs" />
<Compile Include="Screens\Select\FilterSongSelect.cs" /> <Compile Include="Screens\Select\FilterControl.cs" />
<Compile Include="Screens\Select\SearchTextBox.cs" /> <Compile Include="Screens\Select\SearchTextBox.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>