sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 00:09:55 +09:00
Code Issues Packages Projects Releases Wiki Activity

Use IStateful<SelectionState> instead of ISelected

Browse Source
This commit is contained in:
Derrick Timmermans
2021-07-06 12:07:25 +02:00
parent 32ef2405c4
commit c5a0672277
6 changed files with 56 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Graphics/Containers/SelectionCycleFillFlowContainer.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osu.Framework;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics.UserInterface;
@ -11,7 +12,7 @@ namespace osu.Game.Graphics.Containers
/// A FillFlowContainer that provides functionality to cycle selection between children
/// The selection wraps around when overflowing past the first or last child.
/// </summary>
public class SelectionCycleFillFlowContainer<T> : FillFlowContainer<T> where T : Drawable, ISelectable
public class SelectionCycleFillFlowContainer<T> : FillFlowContainer<T> where T : Drawable, IStateful<SelectionState>
{
private int? selectedIndex;
@ -22,13 +23,13 @@ namespace osu.Game.Graphics.Containers
// Deselect the previously-selected button
if (selectedIndex.HasValue)
this[selectedIndex.Value].Selected = false;
this[selectedIndex.Value].State = SelectionState.NotSelected;
selectedIndex = value;
// Select the newly-selected button
if (selectedIndex.HasValue)
this[selectedIndex.Value].Selected = true;
this[selectedIndex.Value].State = SelectionState.Selected;
}
public void SelectNext()