From 29a8ade59f59838796af698c9cb8243d31e771ff Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sat, 16 Dec 2017 23:56:14 +0900 Subject: [PATCH] Rename "Hidden" to "Collapsed" --- osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs | 2 +- osu.Game/Screens/Select/Carousel/CarouselItem.cs | 10 +++++----- .../Screens/Select/Carousel/DrawableCarouselBeatmap.cs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs index cd3fefe8e6..d7e7b1e265 100644 --- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs +++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs @@ -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); diff --git a/osu.Game/Screens/Select/Carousel/CarouselItem.cs b/osu.Game/Screens/Select/Carousel/CarouselItem.cs index 91fe600dc7..12125fe5e0 100644 --- a/osu.Game/Screens/Select/Carousel/CarouselItem.cs +++ b/osu.Game/Screens/Select/Carousel/CarouselItem.cs @@ -21,7 +21,7 @@ namespace osu.Game.Screens.Select.Carousel /// /// This item is not in a hidden state. /// - public bool Visible => State.Value != CarouselItemState.Hidden && !Filtered; + public bool Visible => State.Value != CarouselItemState.Collapsed && !Filtered; public IEnumerable 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, } diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs index cd6cc55037..92768cd88f 100644 --- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs +++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs @@ -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();