From ccfc361626415fe5993fae093bcfb35abcf980e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= Date: Mon, 6 Dec 2021 20:49:29 +0100 Subject: [PATCH] Apply naming suggestions --- osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs | 12 ++++++------ ...eatmapCardDropdown.cs => BeatmapCardContent.cs} | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) rename osu.Game/Beatmaps/Drawables/Cards/{BeatmapCardDropdown.cs => BeatmapCardContent.cs} (94%) diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs index 2ab77539b3..9031d6df1a 100644 --- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs +++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs @@ -44,7 +44,7 @@ namespace osu.Game.Beatmaps.Drawables.Cards private readonly BeatmapDownloadTracker downloadTracker; - private BeatmapCardDropdown dropdown = null!; + private BeatmapCardContent content = null!; private BeatmapCardThumbnail thumbnail = null!; @@ -82,9 +82,9 @@ namespace osu.Game.Beatmaps.Drawables.Cards GridContainer titleContainer; GridContainer artistContainer; - InternalChild = dropdown = new BeatmapCardDropdown(height) + InternalChild = content = new BeatmapCardContent(height) { - Body = new Container + MainContent = new Container { RelativeSizeAxes = Axes.Both, Children = new Drawable[] @@ -282,10 +282,10 @@ namespace osu.Game.Beatmaps.Drawables.Cards { Hovered = _ => { - dropdown.ScheduleShow(); + content.ScheduleShow(); return false; }, - Unhovered = _ => dropdown.ScheduleHide() + Unhovered = _ => content.ScheduleHide() } } }, @@ -304,7 +304,7 @@ namespace osu.Game.Beatmaps.Drawables.Cards } } }, - Dropdown = new Container + ExpandedContent = new Container { RelativeSizeAxes = Axes.X, AutoSizeAxes = Axes.Y, diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardDropdown.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardContent.cs similarity index 94% rename from osu.Game/Beatmaps/Drawables/Cards/BeatmapCardDropdown.cs rename to osu.Game/Beatmaps/Drawables/Cards/BeatmapCardContent.cs index a24f09a9b5..7f94d0e3b7 100644 --- a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardDropdown.cs +++ b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardContent.cs @@ -19,14 +19,14 @@ using osuTK; namespace osu.Game.Beatmaps.Drawables.Cards { - public class BeatmapCardDropdown : CompositeDrawable + public class BeatmapCardContent : CompositeDrawable { - public Drawable Body + public Drawable MainContent { set => bodyContent.Child = value; } - public Drawable Dropdown + public Drawable ExpandedContent { set => dropdownScroll.Child = value; } @@ -40,7 +40,7 @@ namespace osu.Game.Beatmaps.Drawables.Cards private readonly OsuScrollContainer dropdownScroll; private readonly Container borderContainer; - public BeatmapCardDropdown(float height) + public BeatmapCardContent(float height) { RelativeSizeAxes = Axes.X; Height = height; @@ -77,7 +77,7 @@ namespace osu.Game.Beatmaps.Drawables.Cards return true; }, Unhovered = _ => checkForHide(), - Child = dropdownScroll = new DropdownScrollContainer + Child = dropdownScroll = new ExpandedContentScrollContainer { RelativeSizeAxes = Axes.X, ScrollbarVisible = false @@ -179,9 +179,9 @@ namespace osu.Game.Beatmaps.Drawables.Cards }, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint); } - private class DropdownScrollContainer : OsuScrollContainer + private class ExpandedContentScrollContainer : OsuScrollContainer { - public DropdownScrollContainer() + public ExpandedContentScrollContainer() { ScrollbarVisible = false; }