h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 14:07:25 +08:00
Code Issues 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) public CarouselBeatmap(BeatmapInfo beatmap)
{ {
Beatmap = beatmap; Beatmap = beatmap;
State.Value = CarouselItemState.Hidden; State.Value = CarouselItemState.Collapsed;
} }
protected override DrawableCarouselItem CreateDrawableRepresentation() => new DrawableCarouselBeatmap(this); 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> /// <summary>
/// This item is not in a hidden state. /// This item is not in a hidden state.
/// </summary> /// </summary>
public bool Visible => State.Value != CarouselItemState.Hidden && !Filtered; public bool Visible => State.Value != CarouselItemState.Collapsed && !Filtered;
public IEnumerable<DrawableCarouselItem> Drawables public IEnumerable<DrawableCarouselItem> Drawables
{ {
@ -63,14 +63,14 @@ namespace osu.Game.Screens.Select.Carousel
switch (v) switch (v)
{ {
case CarouselItemState.Hidden: case CarouselItemState.Collapsed:
case CarouselItemState.NotSelected: case CarouselItemState.NotSelected:
InternalChildren.ForEach(c => c.State.Value = CarouselItemState.Hidden); InternalChildren.ForEach(c => c.State.Value = CarouselItemState.Collapsed);
break; break;
case CarouselItemState.Selected: case CarouselItemState.Selected:
InternalChildren.ForEach(c => InternalChildren.ForEach(c =>
{ {
if (c.State == CarouselItemState.Hidden) c.State.Value = CarouselItemState.NotSelected; if (c.State == CarouselItemState.Collapsed) c.State.Value = CarouselItemState.NotSelected;
}); });
break; break;
} }
@ -98,7 +98,7 @@ namespace osu.Game.Screens.Select.Carousel
public enum CarouselItemState public enum CarouselItemState
{ {
Hidden, Collapsed,
NotSelected, NotSelected,
Selected, 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() protected override void ApplyState()
{ {
if (Item.State.Value != CarouselItemState.Hidden && Alpha == 0) if (Item.State.Value != CarouselItemState.Collapsed && Alpha == 0)
starCounter.ReplayAnimation(); starCounter.ReplayAnimation();
base.ApplyState(); base.ApplyState();