From 55aba1ca98e46c5c7bf73ad95011e2904d122db5 Mon Sep 17 00:00:00 2001 From: andy840119 Date: Wed, 25 Sep 2024 23:55:04 +0800 Subject: [PATCH] Remove unnecessary code. --- .../Setup/Components/LabelledSingerList.cs | 6 ---- .../Edit/Setup/Components/SingerList.cs | 32 ------------------- .../Edit/Setup/KaraokeSingerSection.cs | 1 - 3 files changed, 39 deletions(-) diff --git a/osu.Game.Rulesets.Karaoke/Edit/Setup/Components/LabelledSingerList.cs b/osu.Game.Rulesets.Karaoke/Edit/Setup/Components/LabelledSingerList.cs index bfee039b0..d8d994908 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Setup/Components/LabelledSingerList.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Setup/Components/LabelledSingerList.cs @@ -16,11 +16,5 @@ public LabelledSingerList() public BindableList Singers => Component.Singers; - public string SingerNamePrefix - { - get => Component.SingerNamePrefix; - set => Component.SingerNamePrefix = value; - } - protected override SingerList CreateComponent() => new(); } diff --git a/osu.Game.Rulesets.Karaoke/Edit/Setup/Components/SingerList.cs b/osu.Game.Rulesets.Karaoke/Edit/Setup/Components/SingerList.cs index 9798282ee..e64d67885 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Setup/Components/SingerList.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Setup/Components/SingerList.cs @@ -35,27 +35,8 @@ public partial class SingerList : CompositeDrawable { public BindableList Singers { get; } = new(); - private string singerNamePrefix = "Singer"; - - public string SingerNamePrefix - { - get => singerNamePrefix; - set - { - if (singerNamePrefix == value) - return; - - singerNamePrefix = value; - - if (IsLoaded) - reindexItems(); - } - } - private FillFlowContainer singers = null!; - private IEnumerable singerDisplays => singers.OfType(); - [BackgroundDependencyLoader] private void load() { @@ -107,24 +88,11 @@ private void updateSingers() Name = "New singer", }), }); - - reindexItems(); } // todo : might have dialog to ask should delete singer or not if contains lyric. private void singerDeletionRequested(Singer singer) => Singers.Remove(singer); - private void reindexItems() - { - int index = 1; - - foreach (var singerDisplay in singerDisplays) - { - // todo : might call singer manager to update singer id? - index += 1; - } - } - /// /// A component which displays a singer along with related description text. /// diff --git a/osu.Game.Rulesets.Karaoke/Edit/Setup/KaraokeSingerSection.cs b/osu.Game.Rulesets.Karaoke/Edit/Setup/KaraokeSingerSection.cs index 75f66ac61..3a64dd23a 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Setup/KaraokeSingerSection.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Setup/KaraokeSingerSection.cs @@ -34,7 +34,6 @@ private void load() Label = "Singer list", Description = "All the singers in beatmap.", FixedLabelWidth = LABEL_WIDTH, - SingerNamePrefix = "#", }, };