mirror of
https://github.com/osukey/osukey.git
synced 2025-08-08 00:53:56 +09:00
Merge pull request #15455 from bdach/fix-multiplayer-text-flow-usages-with-correct-hitbox
Fix multiplayer text flow usages incorrectly wrapping text
This commit is contained in:
@ -67,6 +67,36 @@ namespace osu.Game.Tests.Visual.Multiplayer
|
|||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
createLoungeRoom(new Room
|
createLoungeRoom(new Room
|
||||||
|
{
|
||||||
|
Name = { Value = "Multiplayer room" },
|
||||||
|
Status = { Value = new RoomStatusOpen() },
|
||||||
|
EndDate = { Value = DateTimeOffset.Now.AddDays(1) },
|
||||||
|
Type = { Value = MatchType.HeadToHead },
|
||||||
|
Playlist =
|
||||||
|
{
|
||||||
|
new PlaylistItem
|
||||||
|
{
|
||||||
|
Beatmap =
|
||||||
|
{
|
||||||
|
Value = new TestBeatmap(new OsuRuleset().RulesetInfo)
|
||||||
|
{
|
||||||
|
BeatmapInfo =
|
||||||
|
{
|
||||||
|
StarDifficulty = 2.5,
|
||||||
|
Metadata =
|
||||||
|
{
|
||||||
|
Artist = "very very very very very very very very very long artist",
|
||||||
|
ArtistUnicode = "very very very very very very very very very long artist",
|
||||||
|
Title = "very very very very very very very very very very very long title",
|
||||||
|
TitleUnicode = "very very very very very very very very very very very long title",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}.BeatmapInfo,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
createLoungeRoom(new Room
|
||||||
{
|
{
|
||||||
Name = { Value = "Playlist room with multiple beatmaps" },
|
Name = { Value = "Playlist room with multiple beatmaps" },
|
||||||
Status = { Value = new RoomStatusPlaying() },
|
Status = { Value = new RoomStatusPlaying() },
|
||||||
|
@ -181,8 +181,11 @@ namespace osu.Game.Screens.OnlinePlay
|
|||||||
{
|
{
|
||||||
beatmapText = new LinkFlowContainer(fontParameters)
|
beatmapText = new LinkFlowContainer(fontParameters)
|
||||||
{
|
{
|
||||||
AutoSizeAxes = Axes.Y,
|
|
||||||
RelativeSizeAxes = Axes.X,
|
RelativeSizeAxes = Axes.X,
|
||||||
|
// workaround to ensure only the first line of text shows, emulating truncation (but without ellipsis at the end).
|
||||||
|
// TODO: remove when text/link flow can support truncation with ellipsis natively.
|
||||||
|
Height = OsuFont.DEFAULT_FONT_SIZE,
|
||||||
|
Masking = true
|
||||||
},
|
},
|
||||||
new FillFlowContainer
|
new FillFlowContainer
|
||||||
{
|
{
|
||||||
|
@ -353,7 +353,10 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
|
|||||||
})
|
})
|
||||||
{
|
{
|
||||||
RelativeSizeAxes = Axes.X,
|
RelativeSizeAxes = Axes.X,
|
||||||
AutoSizeAxes = Axes.Y
|
// workaround to ensure only the first line of text shows, emulating truncation (but without ellipsis at the end).
|
||||||
|
// TODO: remove when text/link flow can support truncation with ellipsis natively.
|
||||||
|
Height = 16,
|
||||||
|
Masking = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -385,7 +388,6 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
|
|||||||
creationParameters: s =>
|
creationParameters: s =>
|
||||||
{
|
{
|
||||||
s.Truncate = true;
|
s.Truncate = true;
|
||||||
s.RelativeSizeAxes = Axes.X;
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user