sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 22:26:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Ensure correct selection after deletion of currently selected

Browse Source 
Also fixes a lot of bad interactions and simplifies further.
This commit is contained in:
Dean Herbert
2017-12-16 16:14:37 +09:00
parent 49ce42d90c
commit 3c406662ed
7 changed files with 79 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Screens/Select/Carousel/CarouselGroup.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Collections.Generic;
using osu.Framework.Configuration;
namespace osu.Game.Screens.Select.Carousel
{
@ -13,13 +12,11 @@ namespace osu.Game.Screens.Select.Carousel
{
private readonly List<CarouselItem> items;
public readonly Bindable<CarouselItem> Selected = new Bindable<CarouselItem>();
protected override DrawableCarouselItem CreateDrawableRepresentation() => null;
public override void AddChild(CarouselItem i)
{
i.State.ValueChanged += v => ItemStateChanged(i, v);
i.State.ValueChanged += v => ChildItemStateChanged(i, v);
base.AddChild(i);
}
@ -28,7 +25,7 @@ namespace osu.Game.Screens.Select.Carousel
if (items != null) InternalChildren = items;
}
protected virtual void ItemStateChanged(CarouselItem item, CarouselItemState value)
protected virtual void ChildItemStateChanged(CarouselItem item, CarouselItemState value)
{
// todo: check state of selected item.
@ -42,7 +39,6 @@ namespace osu.Game.Screens.Select.Carousel
}
State.Value = CarouselItemState.Selected;
Selected.Value = item;
}
}
}