From 0a391d5c4ebf9bd38d6cb3b6b8f7313169d75ed8 Mon Sep 17 00:00:00 2001 From: Salman Ahmed Date: Sat, 18 May 2024 08:39:45 +0300 Subject: [PATCH] Remove duplicate back button class --- osu.Game/Screens/Footer/BackButtonV2.cs | 64 ------------------------- osu.Game/Screens/Footer/ScreenFooter.cs | 4 +- 2 files changed, 2 insertions(+), 66 deletions(-) delete mode 100644 osu.Game/Screens/Footer/BackButtonV2.cs diff --git a/osu.Game/Screens/Footer/BackButtonV2.cs b/osu.Game/Screens/Footer/BackButtonV2.cs deleted file mode 100644 index 08daa339c2..0000000000 --- a/osu.Game/Screens/Footer/BackButtonV2.cs +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. -// See the LICENCE file in the repository root for full licence text. - -using osu.Framework.Allocation; -using osu.Framework.Extensions.Color4Extensions; -using osu.Framework.Graphics; -using osu.Framework.Graphics.Containers; -using osu.Framework.Graphics.Sprites; -using osu.Game.Graphics; -using osu.Game.Graphics.Sprites; -using osu.Game.Graphics.UserInterface; -using osu.Game.Localisation; -using osuTK; -using osuTK.Graphics; - -namespace osu.Game.Screens.Footer -{ - public partial class BackButtonV2 : ShearedButton - { - // todo: see https://github.com/ppy/osu-framework/issues/3271 - private const float torus_scale_factor = 1.2f; - - public const float BUTTON_WIDTH = 240; - - public BackButtonV2() - : base(BUTTON_WIDTH, 70) - { - } - - [BackgroundDependencyLoader] - private void load() - { - ButtonContent.Child = new FillFlowContainer - { - X = -10f, - RelativeSizeAxes = Axes.Both, - Direction = FillDirection.Horizontal, - Spacing = new Vector2(20f, 0f), - Children = new Drawable[] - { - new SpriteIcon - { - Anchor = Anchor.Centre, - Origin = Anchor.Centre, - Size = new Vector2(20f), - Icon = FontAwesome.Solid.ChevronLeft, - }, - new OsuSpriteText - { - Anchor = Anchor.Centre, - Origin = Anchor.Centre, - Font = OsuFont.TorusAlternate.With(size: 20 * torus_scale_factor), - Text = CommonStrings.Back, - UseFullGlyphHeight = false, - } - } - }; - - DarkerColour = Color4Extensions.FromHex("#DE31AE"); - LighterColour = Color4Extensions.FromHex("#FF86DD"); - TextColour = Color4.White; - } - } -} diff --git a/osu.Game/Screens/Footer/ScreenFooter.cs b/osu.Game/Screens/Footer/ScreenFooter.cs index 69d5a2616c..9addda5deb 100644 --- a/osu.Game/Screens/Footer/ScreenFooter.cs +++ b/osu.Game/Screens/Footer/ScreenFooter.cs @@ -28,7 +28,7 @@ namespace osu.Game.Screens.Footer private readonly List overlays = new List(); - private BackButtonV2 backButton = null!; + private ScreenBackButton backButton = null!; private FillFlowContainer buttonsFlow = null!; private Container removedButtonsContainer = null!; private LogoTrackingContainer logoTrackingContainer = null!; @@ -71,7 +71,7 @@ namespace osu.Game.Screens.Footer Spacing = new Vector2(7, 0), AutoSizeAxes = Axes.Both }, - backButton = new BackButtonV2 + backButton = new ScreenBackButton { Margin = new MarginPadding { Bottom = 10f, Left = 12f }, Anchor = Anchor.BottomLeft,