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

Use OsuTextFlowContainer for multi-lines

Browse Source
This commit is contained in:
KingLuigi4932 2019-06-13 17:32:27 +03:00
parent 1a50544c94
commit 155f7c7e03
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
osu.Game/Overlays/BeatmapSet/BeatmapNotAvailable.cs
View File

@ -8,7 +8,6 @@ using osu.Framework.Graphics.Shapes;
using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osuTK.Graphics;
namespace osu.Game.Overlays.BeatmapSet
@ -29,47 +28,42 @@ namespace osu.Game.Overlays.BeatmapSet
removeLinks();
if (beatmapSet?.OnlineInfo.Availability != null)
{
Header?.ResizeHeightTo(450, 500);
Show();
}
else
{
Header?.ResizeHeightTo(400, 500);
Hide();
}
}
}
public Header Header;
private readonly OsuSpriteText text;
private readonly OsuTextFlowContainer text;
private readonly LinkFlowContainer link;
public BeatmapNotAvailable()
{
AutoSizeAxes = Axes.Both;
Margin = new MarginPadding { Top = 10 };
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;
Padding = new MarginPadding { Top = 10, Right = 20 };
Children = new Drawable[]
{
new Box
{
Colour = Color4.Black.Opacity(0.6f),
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black.Opacity(0.6f),
},
new FillFlowContainer
{
AutoSizeAxes = Axes.Both,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Vertical,
Margin = new MarginPadding { Top = 10, Left = 5, Right = 20 },
Children = new Drawable[]
{
text = new OsuSpriteText
text = new OsuTextFlowContainer(t => t.Font = OsuFont.GetFont(size: 20, weight: FontWeight.Medium))
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Margin = new MarginPadding { Bottom = 10, Horizontal = 5 },
Font = OsuFont.GetFont(size: 20, weight: FontWeight.Medium),
Colour = Color4.Orange,
},
link = new LinkFlowContainer(t => t.Font = OsuFont.GetFont(size: 14))

2
osu.Game/Overlays/BeatmapSet/Header.cs
View File

@ -135,7 +135,7 @@ namespace osu.Game.Overlays.BeatmapSet
Margin = new MarginPadding { Top = 20 },
Child = author = new AuthorInfo(),
},
beatmapNotAvailable = new BeatmapNotAvailable { Header = this },
beatmapNotAvailable = new BeatmapNotAvailable(),
new Container
{
RelativeSizeAxes = Axes.X,