h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-28 09:37:23 +08:00
Code Issues Releases Wiki Activity

Merge pull request #10121 from smoogipoo/fix-filtercontrol-order

Browse Source
This commit is contained in:
Dean Herbert 2020-09-11 13:49:04 +09:00 committed by GitHub
commit 7f16a41cc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 62 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
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,89 +99,80 @@ 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 Container
new Dimension(GridSizeMode.Absolute, 5),
new Dimension(GridSizeMode.Absolute, 20),
},
Content = new[]
{
new Drawable[]
{ {
new Container RelativeSizeAxes = Axes.X,
Height = 60,
Children = new Drawable[]
{ {
RelativeSizeAxes = Axes.Both, searchTextBox = new SeekLimitedSearchTextBox { RelativeSizeAxes = Axes.X },
Children = new Drawable[] new Box
{ {
searchTextBox = new SeekLimitedSearchTextBox { RelativeSizeAxes = Axes.X }, RelativeSizeAxes = Axes.X,
new Box Height = 1,
Colour = OsuColour.Gray(80),
Origin = Anchor.BottomLeft,
Anchor = Anchor.BottomLeft,
},
new FillFlowContainer
{
Anchor = Anchor.BottomRight,
Origin = Anchor.BottomRight,
Direction = FillDirection.Horizontal,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Spacing = new Vector2(OsuTabControl<SortMode>.HORIZONTAL_SPACING, 0),
Children = new Drawable[]
{ {
RelativeSizeAxes = Axes.X, new OsuTabControlCheckbox
Height = 1,
Colour = OsuColour.Gray(80),
Origin = Anchor.BottomLeft,
Anchor = Anchor.BottomLeft,
},
new FillFlowContainer
{
Anchor = Anchor.BottomRight,
Origin = Anchor.BottomRight,
Direction = FillDirection.Horizontal,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Spacing = new Vector2(OsuTabControl<SortMode>.HORIZONTAL_SPACING, 0),
Children = new Drawable[]
{ {
new OsuTabControlCheckbox Text = "Show converted",
{ Current = config.GetBindable<bool>(OsuSetting.ShowConvertedBeatmaps),
Text = "Show converted", Anchor = Anchor.BottomRight,
Current = config.GetBindable<bool>(OsuSetting.ShowConvertedBeatmaps), Origin = Anchor.BottomRight,
Anchor = Anchor.BottomRight, },
Origin = Anchor.BottomRight, sortTabs = new OsuTabControl<SortMode>
}, {
sortTabs = new OsuTabControl<SortMode> RelativeSizeAxes = Axes.X,
{ Width = 0.5f,
RelativeSizeAxes = Axes.X, Height = 24,
Width = 0.5f, AutoSort = true,
Height = 24, Anchor = Anchor.BottomRight,
AutoSort = true, Origin = Anchor.BottomRight,
Anchor = Anchor.BottomRight, AccentColour = colours.GreenLight,
Origin = Anchor.BottomRight, Current = { BindTarget = sortMode }
AccentColour = colours.GreenLight, },
Current = { BindTarget = sortMode } new OsuSpriteText
}, {
new OsuSpriteText Text = "Sort by",
{ Font = OsuFont.GetFont(size: 14),
Text = "Sort by", Margin = new MarginPadding(5),
Font = OsuFont.GetFont(size: 14), Anchor = Anchor.BottomRight,
Margin = new MarginPadding(5), Origin = Anchor.BottomRight,
Anchor = Anchor.BottomRight, },
Origin = Anchor.BottomRight, }
}, },
}
},
}
} }
}, },
null, new Container
new Drawable[]
{ {
new Container RelativeSizeAxes = Axes.X,
Height = 20,
Children = new Drawable[]
{ {
RelativeSizeAxes = Axes.Both, collectionDropdown = new CollectionFilterDropdown
Children = new Drawable[]
{ {
collectionDropdown = new CollectionFilterDropdown Anchor = Anchor.TopRight,
{ Origin = Anchor.TopRight,
Anchor = Anchor.TopRight, RelativeSizeAxes = Axes.X,
Origin = Anchor.TopRight, Width = 0.4f,
RelativeSizeAxes = Axes.X,
Width = 0.4f,
}
} }
} }
}, },