sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-29 09:27:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9514 from Joehuu/fix-multi-room-name-overflow

Browse Source
This commit is contained in:
Dean Herbert 2020-07-12 13:02:20 +09:00 committed by GitHub
commit 57cfdb82ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Screens/Multi/Lounge/Components/RoomInfo.cs
View File

@ -4,9 +4,8 @@
using System.Collections.Generic; using System.Collections.Generic;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Containers;
using osu.Game.Screens.Multi.Components; using osu.Game.Screens.Multi.Components;
using osuTK; using osuTK;
@ -15,7 +14,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
public class RoomInfo : MultiplayerComposite public class RoomInfo : MultiplayerComposite
{ {
private readonly List<Drawable> statusElements = new List<Drawable>(); private readonly List<Drawable> statusElements = new List<Drawable>();
private readonly SpriteText roomName; private readonly OsuTextFlowContainer roomName;
public RoomInfo() public RoomInfo()
{ {
@ -43,18 +42,23 @@ namespace osu.Game.Screens.Multi.Lounge.Components
{ {
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
AutoSizeAxes = Axes.Both, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Vertical, Direction = FillDirection.Vertical,
Children = new Drawable[] Children = new Drawable[]
{ {
roomName = new OsuSpriteText { Font = OsuFont.GetFont(size: 30) }, roomName = new OsuTextFlowContainer(t => t.Font = OsuFont.GetFont(size: 30))
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
},
statusInfo = new RoomStatusInfo(), statusInfo = new RoomStatusInfo(),
} }
}, },
typeInfo = new ModeTypeInfo typeInfo = new ModeTypeInfo
{ {
Anchor = Anchor.CentreRight, Anchor = Anchor.BottomRight,
Origin = Anchor.CentreRight Origin = Anchor.BottomRight
} }
} }
}, },