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

Fix song select filter ordering

Browse Source
This commit is contained in:
smoogipoo
2020-09-10 23:36:22 +09:00
parent 58186fc476
commit 314cd13b74
1 changed files with 62 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Game.Configuration; using osu.Game.Configuration;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Rulesets; using osu.Game.Rulesets;
@ -98,22 +99,17 @@ namespace osu.Game.Screens.Select
Width = 0.5f, Width = 0.5f,
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
Child = new GridContainer // Reverse ChildID so that dropdowns in the top section appear on top of the bottom section.
Child = new ReverseChildIDFillFlowContainer<Drawable>
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
RowDimensions = new[] Spacing = new Vector2(0, 5),
{ Children = new[]
new Dimension(GridSizeMode.Absolute, 60),
new Dimension(GridSizeMode.Absolute, 5),
new Dimension(GridSizeMode.Absolute, 20),
},
Content = new[]
{
new Drawable[]
{ {
new Container new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.X,
Height = 60,
Children = new Drawable[] Children = new Drawable[]
{ {
searchTextBox = new SeekLimitedSearchTextBox { RelativeSizeAxes = Axes.X }, searchTextBox = new SeekLimitedSearchTextBox { RelativeSizeAxes = Axes.X },
@ -164,14 +160,11 @@ namespace osu.Game.Screens.Select
} }
}, },
} }
}
}, },
null,
new Drawable[]
{
new Container new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.X,
Height = 20,
Children = new Drawable[] Children = new Drawable[]
{ {
collectionDropdown = new CollectionFilterDropdown collectionDropdown = new CollectionFilterDropdown
@ -182,7 +175,6 @@ namespace osu.Game.Screens.Select
Width = 0.4f, Width = 0.4f,
} }
} }
}
}, },
} }
} }