sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 08:20:00 +09:00
Code Issues Packages Projects Releases Wiki Activity

Extract header element from base DrawableCarouselItem class

Browse Source
This commit is contained in:
Dean Herbert
2020-10-13 15:19:32 +09:00
parent 2aad482545
commit cfec4f4fc1
5 changed files with 152 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
View File

@ -67,16 +67,12 @@ namespace osu.Game.Screens.Select.Carousel
if (beatmapOverlay != null)
viewDetails = beatmapOverlay.FetchAndShowBeatmapSet;
// TODO: temporary. we probably want to *not* inherit DrawableCarouselItem for this class, but only the above header portion.
AddRangeInternal(new Drawable[]
Content.Add(beatmapContainer = new Container<DrawableCarouselItem>
{
beatmapContainer = new Container<DrawableCarouselItem>
{
X = 50,
Y = MAX_HEIGHT,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
},
X = 50,
Y = MAX_HEIGHT,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
});
}
@ -90,7 +86,7 @@ namespace osu.Game.Screens.Select.Carousel
return;
Logger.Log($"updating item {beatmapSet}");
Content.Children = new Drawable[]
Header.Children = new Drawable[]
{
new DelayedLoadUnloadWrapper(() =>
{
@ -163,7 +159,7 @@ namespace osu.Game.Screens.Select.Carousel
{
base.Deselected();
BorderContainer.MoveToX(0, 500, Easing.OutExpo);
MovementContainer.MoveToX(0, 500, Easing.OutExpo);
foreach (var beatmap in beatmapContainer)
{
@ -176,7 +172,7 @@ namespace osu.Game.Screens.Select.Carousel
{
base.Selected();
BorderContainer.MoveToX(-100, 500, Easing.OutExpo);
MovementContainer.MoveToX(-100, 500, Easing.OutExpo);
// on selection we show our child beatmaps.
// for now this is a simple drawable construction each selection.