Merge branch 'master' into update-framework

This commit is contained in:
Bartłomiej Dach
2022-11-26 16:19:36 +01:00
40 changed files with 252 additions and 180 deletions

View File

@ -13,7 +13,6 @@ using osuTK;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Localisation;
using osu.Game.Graphics.UserInterface;
using osu.Framework.Screens;
using osu.Game.Graphics.Containers;
using osu.Game.Localisation;
@ -22,7 +21,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
{
public abstract partial class DirectorySelectScreen : OsuScreen
{
private TriangleButton selectionButton;
private RoundedButton selectionButton;
private OsuDirectorySelector directorySelector;
@ -101,7 +100,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
},
new Drawable[]
{
selectionButton = new TriangleButton
selectionButton = new RoundedButton
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,