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

Merge pull request #18392 from peppy/editor-remove-triangle-button-usage

Browse Source 
Remove `TriangleButton` usage in editor
This commit is contained in:
Dan Balasescu 2022-05-24 18:51:02 +09:00 committed by GitHub
commit 46b2f1ecc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/Edit/Timing/GroupSection.cs
View File

@ -17,7 +17,7 @@ namespace osu.Game.Screens.Edit.Timing
{ {
private LabelledTextBox textBox; private LabelledTextBox textBox;
private TriangleButton button; private OsuButton button;
[Resolved] [Resolved]
protected Bindable<ControlPointGroup> SelectedGroup { get; private set; } protected Bindable<ControlPointGroup> SelectedGroup { get; private set; }
@ -53,7 +53,7 @@ namespace osu.Game.Screens.Edit.Timing
{ {
Label = "Time" Label = "Time"
}, },
button = new TriangleButton button = new RoundedButton
{ {
Text = "Use current time", Text = "Use current time",
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,

5
osu.Game/Screens/Edit/Timing/TimingScreen.cs
View File

@ -10,6 +10,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Game.Beatmaps.ControlPoints; using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Graphics.UserInterfaceV2;
using osu.Game.Overlays; using osu.Game.Overlays;
using osuTK; using osuTK;
@ -100,7 +101,7 @@ namespace osu.Game.Screens.Edit.Timing
Spacing = new Vector2(5), Spacing = new Vector2(5),
Children = new Drawable[] Children = new Drawable[]
{ {
deleteButton = new OsuButton deleteButton = new RoundedButton
{ {
Text = "-", Text = "-",
Size = new Vector2(30, 30), Size = new Vector2(30, 30),
@ -108,7 +109,7 @@ namespace osu.Game.Screens.Edit.Timing
Anchor = Anchor.BottomRight, Anchor = Anchor.BottomRight,
Origin = Anchor.BottomRight, Origin = Anchor.BottomRight,
}, },
new OsuButton new RoundedButton
{ {
Text = "+ Add at current time", Text = "+ Add at current time",
Action = addNew, Action = addNew,

4
osu.Game/Screens/Edit/Verify/IssueList.cs
View File

@ -10,7 +10,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterfaceV2;
using osu.Game.Overlays; using osu.Game.Overlays;
using osu.Game.Rulesets.Edit; using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Edit.Checks.Components; using osu.Game.Rulesets.Edit.Checks.Components;
@ -67,7 +67,7 @@ namespace osu.Game.Screens.Edit.Verify
Margin = new MarginPadding(20), Margin = new MarginPadding(20),
Children = new Drawable[] Children = new Drawable[]
{ {
new TriangleButton new RoundedButton
{ {
Text = "Refresh", Text = "Refresh",
Action = refresh, Action = refresh,