Merge pull request #14848 from Joehuu/fix-dropdown-text-overflow

Fix text overflowing on dropdown headers
This commit is contained in:
Bartłomiej Dach 2021-09-25 15:37:12 +02:00 committed by GitHub
commit 671fe77213
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -274,21 +274,40 @@ namespace osu.Game.Graphics.UserInterface
CornerRadius = corner_radius; CornerRadius = corner_radius;
Height = 40; Height = 40;
Foreground.Children = new Drawable[] Foreground.Child = new GridContainer
{ {
Text = new OsuSpriteText RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
RowDimensions = new[]
{ {
Anchor = Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize),
Origin = Anchor.CentreLeft,
}, },
Icon = new SpriteIcon ColumnDimensions = new[]
{ {
Icon = FontAwesome.Solid.ChevronDown, new Dimension(),
Anchor = Anchor.CentreRight, new Dimension(GridSizeMode.AutoSize),
Origin = Anchor.CentreRight,
Margin = new MarginPadding { Right = 5 },
Size = new Vector2(12),
}, },
Content = new[]
{
new Drawable[]
{
Text = new OsuSpriteText
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
RelativeSizeAxes = Axes.X,
Truncate = true,
},
Icon = new SpriteIcon
{
Icon = FontAwesome.Solid.ChevronDown,
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
Margin = new MarginPadding { Horizontal = 5 },
Size = new Vector2(12),
},
}
}
}; };
AddInternal(new HoverClickSounds()); AddInternal(new HoverClickSounds());