h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 06:45:37 +08:00
Code Issues Releases Wiki Activity

Fixed Warnings

Browse Source
This commit is contained in:
Kelvin 2017-03-14 20:42:02 -07:00
parent 18afd8eabe
commit 4353c9dc3d
4 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Screens/Select/FilterControl.cs
View File

@ -49,8 +49,6 @@ namespace osu.Game.Screens.Select
} }
} }
private TabControl<GroupMode> groupTabs;
private TabControl<SortMode> sortTabs;
private OsuSpriteText spriteText; private OsuSpriteText spriteText;
public Action Exit; public Action Exit;
@ -59,6 +57,9 @@ namespace osu.Game.Screens.Select
public FilterControl(float height) public FilterControl(float height)
{ {
TabControl<SortMode> sortTabs;
TabControl<GroupMode> groupTabs;
Children = new Drawable[] Children = new Drawable[]
{ {
new Box new Box

4
osu.Game/Screens/Select/Tab/FilterTabDropDownHeader.cs
View File

@ -12,12 +12,10 @@ namespace osu.Game.Screens.Select.Tab
{ {
protected override string Label { get; set; } protected override string Label { get; set; }
private TextAwesome ellipses;
public FilterTabDropDownHeader() { public FilterTabDropDownHeader() {
Foreground.Children = new Drawable[] Foreground.Children = new Drawable[]
{ {
ellipses = new TextAwesome new TextAwesome
{ {
Icon = FontAwesome.fa_ellipsis_h, Icon = FontAwesome.fa_ellipsis_h,
TextSize = 14, TextSize = 14,

13
osu.Game/Screens/Select/Tab/FilterTabDropDownMenu.cs
View File

@ -44,19 +44,12 @@ namespace osu.Game.Screens.Select.Tab
protected override void UpdateContentHeight() protected override void UpdateContentHeight()
{ {
if (State == DropDownMenuState.Opened) ContentContainer.ResizeTo(new Vector2(1, State == DropDownMenuState.Opened ? ContentHeight : 0), 300, EasingTypes.OutQuint);
ContentContainer.ResizeTo(new Vector2(1, ContentHeight), 300, EasingTypes.OutQuint);
else
ContentContainer.ResizeTo(new Vector2(1, 0), 300, EasingTypes.OutQuint);
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours) {
{ Header.Colour = typeof(T) == typeof(SortMode) ? colours.GreenLight : colours.Blue;
if (typeof(T) == typeof(SortMode))
Header.Colour = colours.GreenLight;
else
Header.Colour = colours.Blue;
} }
} }
} }

8
osu.Game/Screens/Select/Tab/FilterTabDropDownMenuItem.cs
View File

@ -39,13 +39,13 @@ namespace osu.Game.Screens.Select.Tab
if (typeof(T) == typeof(SortMode)) if (typeof(T) == typeof(SortMode))
{ {
BackgroundColourHover = new Color4(163, 196, 36, 255); BackgroundColourHover = colours.GreenLight;
BackgroundColourSelected = new Color4(163, 196, 36, 255); BackgroundColourSelected = colours.GreenLight;
} }
else else
{ {
BackgroundColourHover = new Color4(124, 200, 253, 255); BackgroundColourHover = colours.Blue;
BackgroundColourSelected = new Color4(124, 200, 253, 255); BackgroundColourSelected = colours.Blue;
} }
} }
} }