h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 20:32:55 +08:00
Code Issues Releases Wiki Activity

Prefer composite over inheritance for drawable parts

Browse Source
This commit is contained in:
ekrctb 2021-09-09 12:51:21 +09:00
parent 210640af09
commit 52bb02baed
4 changed files with 69 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
osu.Game/Overlays/BeatmapSet/BeatmapSetBadgePill.cs
View File

@ -1,32 +0,0 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using JetBrains.Annotations;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics;
using osuTK.Graphics;
namespace osu.Game.Overlays.BeatmapSet
{
public class BeatmapSetBadgePill : CircularContainer
{
public BeatmapSetBadgePill()
{
AutoSizeAxes = Axes.Both;
Masking = true;
}
[BackgroundDependencyLoader(true)]
private void load([CanBeNull] OsuColour colours, [CanBeNull] OverlayColourProvider colourProvider)
{
Add(new Box
{
RelativeSizeAxes = Axes.Both,
Colour = colourProvider?.Background5 ?? colours?.Gray2 ?? Color4.DarkGray,
});
}
}
}

45
osu.Game/Overlays/BeatmapSet/BeatmapSetBadgePillContainer.cs Normal file
View File

@ -0,0 +1,45 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using JetBrains.Annotations;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics;
using osuTK.Graphics;
namespace osu.Game.Overlays.BeatmapSet
{
public class BeatmapSetBadgePillContainer : CircularContainer
{
protected override Container<Drawable> Content => contentContainer;
private readonly Box background;
private readonly Container contentContainer;
public BeatmapSetBadgePillContainer()
{
Masking = true;
AutoSizeAxes = Axes.Both;
InternalChildren = new Drawable[]
{
background = new Box
{
RelativeSizeAxes = Axes.Both,
},
contentContainer = new Container
{
AutoSizeAxes = Axes.Both,
Padding = new MarginPadding { Horizontal = 10f, Vertical = 2f },
}
};
}
[BackgroundDependencyLoader(true)]
private void load([CanBeNull] OsuColour colours, [CanBeNull] OverlayColourProvider colourProvider)
{
background.Colour = colourProvider?.Background5 ?? colours?.Gray2 ?? Color4.DarkGray;
}
}
}

22
osu.Game/Overlays/BeatmapSet/ExplicitContentBeatmapPill.cs
View File

@ -1,27 +1,29 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
using osu.Framework.Extensions.LocalisationExtensions; using osu.Framework.Extensions.LocalisationExtensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Resources.Localisation.Web; using osu.Game.Resources.Localisation.Web;
namespace osu.Game.Overlays.BeatmapSet namespace osu.Game.Overlays.BeatmapSet
{ {
public class ExplicitContentBeatmapPill : BeatmapSetBadgePill public class ExplicitContentBeatmapPill : CompositeDrawable
{ {
[BackgroundDependencyLoader] public ExplicitContentBeatmapPill()
private void load()
{ {
Add(new OsuSpriteText AutoSizeAxes = Axes.Both;
InternalChild = new BeatmapSetBadgePillContainer
{ {
Margin = new MarginPadding { Horizontal = 10f, Vertical = 2f }, Child = new OsuSpriteText
Text = BeatmapsetsStrings.NsfwBadgeLabel.ToUpper(), {
Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold), Text = BeatmapsetsStrings.NsfwBadgeLabel.ToUpper(),
Colour = OverlayColourProvider.Orange.Colour2, Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold),
}); Colour = OverlayColourProvider.Orange.Colour2,
}
};
} }
} }
} }

22
osu.Game/Overlays/BeatmapSet/FeaturedArtistBeatmapPill.cs
View File

@ -1,27 +1,29 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
using osu.Framework.Extensions.LocalisationExtensions; using osu.Framework.Extensions.LocalisationExtensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Resources.Localisation.Web; using osu.Game.Resources.Localisation.Web;
namespace osu.Game.Overlays.BeatmapSet namespace osu.Game.Overlays.BeatmapSet
{ {
public class FeaturedArtistBeatmapPill : BeatmapSetBadgePill public class FeaturedArtistBeatmapPill : CompositeDrawable
{ {
[BackgroundDependencyLoader] public FeaturedArtistBeatmapPill()
private void load()
{ {
Add(new OsuSpriteText AutoSizeAxes = Axes.Both;
InternalChild = new BeatmapSetBadgePillContainer
{ {
Margin = new MarginPadding { Horizontal = 10f, Vertical = 2f }, Child = new OsuSpriteText
Text = BeatmapsetsStrings.FeaturedArtistBadgeLabel.ToUpper(), {
Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold), Text = BeatmapsetsStrings.FeaturedArtistBadgeLabel.ToUpper(),
Colour = OverlayColourProvider.Blue.Colour1 Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold),
}); Colour = OverlayColourProvider.Blue.Colour1
}
};
} }
} }
} }