RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply naming suggestions

This commit is contained in:
Bartłomiej Dach 2021-12-06 20:49:29 +01:00
parent 0f74389389
commit ccfc361626
No known key found for this signature in database
GPG Key ID: BCECCD4FA41F6497
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Beatmaps/Drawables/Cards/BeatmapCard.cs
View File

@ -44,7 +44,7 @@ public class BeatmapCard : OsuClickableContainer
private readonly BeatmapDownloadTracker downloadTracker;
private BeatmapCardDropdown dropdown = null!;
private BeatmapCardContent content = null!;
private BeatmapCardThumbnail thumbnail = null!;
@ -82,9 +82,9 @@ private void load(BeatmapSetOverlay? beatmapSetOverlay)
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 @@ private void load(BeatmapSetOverlay? beatmapSetOverlay)
{
Hovered = _ =>
{
dropdown.ScheduleShow();
content.ScheduleShow();
return false;
},
Unhovered = _ => dropdown.ScheduleHide()
Unhovered = _ => content.ScheduleHide()
}
}
},
@ -304,7 +304,7 @@ private void load(BeatmapSetOverlay? beatmapSetOverlay)
}
}
},
Dropdown = new Container
ExpandedContent = new Container
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,

14
osu.Game/Beatmaps/Drawables/Cards/BeatmapCardDropdown.cs → osu.Game/Beatmaps/Drawables/Cards/BeatmapCardContent.cs
View File

@ -19,14 +19,14 @@
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 @@ public Drawable Dropdown
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 @@ public BeatmapCardDropdown(float height)
return true;
},
Unhovered = _ => checkForHide(),
Child = dropdownScroll = new DropdownScrollContainer
Child = dropdownScroll = new ExpandedContentScrollContainer
{
RelativeSizeAxes = Axes.X,
ScrollbarVisible = false
@ -179,9 +179,9 @@ private void updateState()
}, BeatmapCard.TRANSITION_DURATION, Easing.OutQuint);
}
private class DropdownScrollContainer : OsuScrollContainer
private class ExpandedContentScrollContainer : OsuScrollContainer
{
public DropdownScrollContainer()
public ExpandedContentScrollContainer()
{
ScrollbarVisible = false;
}