h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 20:03:21 +08:00
Code Issues Releases Wiki Activity

Update UI with new components

Browse Source
This commit is contained in:
Naxess 2021-04-07 14:38:43 +02:00
parent 9c4604e3c5
commit bab36e529a
4 changed files with 229 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
osu.Game/Screens/Edit/Verify/IssueSettings.cs Normal file
View File

@ -0,0 +1,47 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
namespace osu.Game.Screens.Edit.Verify
{
public class IssueSettings : CompositeDrawable
{
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
RelativeSizeAxes = Axes.Both;
InternalChildren = new Drawable[]
{
new Box
{
Colour = colours.Gray3,
RelativeSizeAxes = Axes.Both,
},
new OsuScrollContainer
{
RelativeSizeAxes = Axes.Both,
Child = new FillFlowContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Vertical,
Children = createSections()
},
}
};
}
private IReadOnlyList<Drawable> createSections() => new Drawable[]
{
new VisibilitySettings()
};
}
}

91
osu.Game/Screens/Edit/Verify/IssueTable.cs
View File

@ -4,16 +4,16 @@
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Events;
using osu.Game.Extensions;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Input.Bindings;
using osu.Game.Screens.Edit.Verify.Components;
using osuTK.Graphics;
namespace osu.Game.Screens.Edit.Verify
@ -34,6 +34,9 @@ namespace osu.Game.Screens.Edit.Verify
Padding = new MarginPadding { Horizontal = horizontal_inset };
RowSize = new Dimension(GridSizeMode.Absolute, row_height);
Masking = true;
CornerRadius = 6;
AddInternal(backgroundFlow = new FillFlowContainer
{
RelativeSizeAxes = Axes.Both,
@ -55,7 +58,7 @@ namespace osu.Game.Screens.Edit.Verify
foreach (var issue in value)
{
backgroundFlow.Add(new IssueTable.RowBackground(issue));
backgroundFlow.Add(new RowBackground(issue));
}
Columns = createHeaders();
@ -68,9 +71,10 @@ namespace osu.Game.Screens.Edit.Verify
var columns = new List<TableColumn>
{
new TableColumn(string.Empty, Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
new TableColumn("Type", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
new TableColumn("Time", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
new TableColumn(),
new TableColumn("Attributes", Anchor.CentreLeft),
new TableColumn("Message", Anchor.CentreLeft),
new TableColumn("Category", Anchor.CentreRight, new Dimension(GridSizeMode.AutoSize)),
};
return columns.ToArray();
@ -81,21 +85,36 @@ namespace osu.Game.Screens.Edit.Verify
new OsuSpriteText
{
Text = $"#{index + 1}",
Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Medium)
},
new OsuSpriteText
{
Text = issue.Template.Type.ToString(),
Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
Margin = new MarginPadding { Left = 10 },
Colour = issue.Template.TypeColour()
},
new OsuSpriteText
{
Text = issue.GetEditorTimestamp(),
Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
Margin = new MarginPadding(10)
},
new OsuSpriteText
{
Text = issue.Time.ToEditorFormattedString(),
Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold)
Text = issue.ToString(),
Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Medium)
},
null,
null //new ControlGroupAttributes(issue),
new OsuSpriteText
{
Text = issue.Template.Origin.Metadata().Category.ToString(),
Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
Margin = new MarginPadding(10)
}
};
public class RowBackground : OsuClickableContainer
{
private readonly Issue issue;
private const int fade_duration = 100;
private readonly Box hoveredBackground;
@ -104,13 +123,15 @@ namespace osu.Game.Screens.Edit.Verify
private EditorClock clock { get; set; }
[Resolved]
private Bindable<Issue> selectedIssue { get; set; }
private Editor editor { get; set; }
[Resolved]
private EditorBeatmap editorBeatmap { get; set; }
public RowBackground(Issue issue)
{
this.issue = issue;
RelativeSizeAxes = Axes.X;
Height = 25;
Height = row_height;
AlwaysPresent = true;
@ -128,41 +149,29 @@ namespace osu.Game.Screens.Edit.Verify
Action = () =>
{
selectedIssue.Value = issue;
clock.SeekSmoothlyTo(issue.Time);
// Supposed to work like clicking timestamps outside of the game.
// TODO: Is there already defined behaviour for this I may be able to call?
if (issue.Time != null)
{
clock.Seek(issue.Time.Value);
editor.OnPressed(GlobalAction.EditorComposeMode);
}
if (!issue.HitObjects.Any())
return;
editorBeatmap.SelectedHitObjects.Clear();
editorBeatmap.SelectedHitObjects.AddRange(issue.HitObjects);
};
}
private Color4 colourHover;
private Color4 colourSelected;
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
hoveredBackground.Colour = colourHover = colours.BlueDarker;
colourSelected = colours.YellowDarker;
}
protected override void LoadComplete()
{
base.LoadComplete();
selectedIssue.BindValueChanged(group => { Selected = issue == group.NewValue; }, true);
}
private bool selected;
protected bool Selected
{
get => selected;
set
{
if (value == selected)
return;
selected = value;
updateState();
}
}
protected override bool OnHover(HoverEvent e)
@ -179,9 +188,9 @@ namespace osu.Game.Screens.Edit.Verify
private void updateState()
{
hoveredBackground.FadeColour(selected ? colourSelected : colourHover, 450, Easing.OutQuint);
hoveredBackground.FadeColour(colourHover, 450, Easing.OutQuint);
if (selected || IsHovered)
if (IsHovered)
hoveredBackground.FadeIn(fade_duration, Easing.OutQuint);
else
hoveredBackground.FadeOut(fade_duration, Easing.OutQuint);

98
osu.Game/Screens/Edit/Verify/VerifyScreen.cs
View File

@ -1,40 +1,70 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Edit;
using osuTK;
namespace osu.Game.Screens.Edit.Verify
{
public class VerifyScreen : EditorScreenWithTimeline
public class VerifyScreen : EditorScreen
{
private Ruleset ruleset;
private static Checker checker; // TODO: Should not be static, but apparently needs to be?
public VerifyScreen()
: base(EditorScreenMode.Verify)
{
}
protected override Drawable CreateMainContent() => new GridContainer
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
{
RelativeSizeAxes = Axes.Both,
ColumnDimensions = new[]
{
new Dimension(),
new Dimension(GridSizeMode.Absolute, 200),
},
Content = new[]
{
new Drawable[]
{
new ControlPointList()
},
}
};
var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
public class ControlPointList : CompositeDrawable
ruleset = parent.Get<IBindable<WorkingBeatmap>>().Value.BeatmapInfo.Ruleset?.CreateInstance();
checker = ruleset?.CreateChecker();
return dependencies;
}
[BackgroundDependencyLoader]
private void load()
{
Child = new Container
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding(20),
Child = new GridContainer
{
RelativeSizeAxes = Axes.Both,
ColumnDimensions = new[]
{
new Dimension(),
new Dimension(GridSizeMode.Absolute, 200),
},
Content = new[]
{
new Drawable[]
{
new IssueList(),
new IssueSettings(),
},
}
}
};
}
public class IssueList : CompositeDrawable
{
private IssueTable table;
@ -60,9 +90,41 @@ namespace osu.Game.Screens.Edit.Verify
{
RelativeSizeAxes = Axes.Both,
Child = table = new IssueTable(),
}
},
new FillFlowContainer
{
AutoSizeAxes = Axes.Both,
Anchor = Anchor.BottomRight,
Origin = Anchor.BottomRight,
Margin = new MarginPadding(20),
Children = new Drawable[]
{
new TriangleButton
{
Text = "Refresh",
Action = refresh,
Size = new Vector2(120, 40),
Anchor = Anchor.BottomRight,
Origin = Anchor.BottomRight,
},
}
},
};
}
protected override void LoadComplete()
{
base.LoadComplete();
refresh();
}
private void refresh()
{
table.Issues = checker.Run(Beatmap)
.OrderByDescending(issue => issue.Template.Type)
.ThenByDescending(issue => issue.Template.Origin.Metadata().Category);
}
}
}
}

52
osu.Game/Screens/Edit/Verify/VisibilitySettings.cs Normal file
View File

@ -0,0 +1,52 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics.UserInterfaceV2;
using osuTK;
namespace osu.Game.Screens.Edit.Verify
{
internal class VisibilitySettings : CompositeDrawable
{
[BackgroundDependencyLoader]
private void load()
{
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;
Padding = new MarginPadding(10);
InternalChildren = new Drawable[]
{
new FillFlowContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Spacing = new Vector2(10),
Direction = FillDirection.Vertical,
Children = new Drawable[]
{
new LabelledSwitchButton
{
Label = "Show problems",
Current = new Bindable<bool>(true)
},
new LabelledSwitchButton
{
Label = "Show warnings",
Current = new Bindable<bool>(true)
},
new LabelledSwitchButton
{
Label = "Show negligibles"
}
}
},
};
}
}
}