RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-02-20 12:26:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename "Hidden" to "Collapsed"

Browse Source
This commit is contained in:
Dean Herbert 2017-12-16 23:56:14 +09:00
parent da0940ae0b
commit 29a8ade59f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
View File

@ -15,7 +15,7 @@ namespace osu.Game.Screens.Select.Carousel
public CarouselBeatmap(BeatmapInfo beatmap)
{
Beatmap = beatmap;
State.Value = CarouselItemState.Hidden;
State.Value = CarouselItemState.Collapsed;
}
protected override DrawableCarouselItem CreateDrawableRepresentation() => new DrawableCarouselBeatmap(this);

10
osu.Game/Screens/Select/Carousel/CarouselItem.cs
View File

@ -21,7 +21,7 @@ namespace osu.Game.Screens.Select.Carousel
/// <summary>
/// This item is not in a hidden state.
/// </summary>
public bool Visible => State.Value != CarouselItemState.Hidden && !Filtered;
public bool Visible => State.Value != CarouselItemState.Collapsed && !Filtered;
public IEnumerable<DrawableCarouselItem> Drawables
{
@ -63,14 +63,14 @@ namespace osu.Game.Screens.Select.Carousel
switch (v)
{
case CarouselItemState.Hidden:
case CarouselItemState.Collapsed:
case CarouselItemState.NotSelected:
InternalChildren.ForEach(c => c.State.Value = CarouselItemState.Hidden);
InternalChildren.ForEach(c => c.State.Value = CarouselItemState.Collapsed);
break;
case CarouselItemState.Selected:
InternalChildren.ForEach(c =>
{
if (c.State == CarouselItemState.Hidden) c.State.Value = CarouselItemState.NotSelected;
if (c.State == CarouselItemState.Collapsed) c.State.Value = CarouselItemState.NotSelected;
});
break;
}
@ -98,7 +98,7 @@ namespace osu.Game.Screens.Select.Carousel
public enum CarouselItemState
{
Hidden,
Collapsed,
NotSelected,
Selected,
}

2
osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
View File

@ -160,7 +160,7 @@ namespace osu.Game.Screens.Select.Carousel
protected override void ApplyState()
{
if (Item.State.Value != CarouselItemState.Hidden && Alpha == 0)
if (Item.State.Value != CarouselItemState.Collapsed && Alpha == 0)
starCounter.ReplayAnimation();
base.ApplyState();