Merge master with conflicts resolved

2025-08-03 14:46:38 +09:00 · 2019-12-27 05:17:53 +03:00
parent bd6e603be3 66ae97709a
commit 3ae0564db7
2 changed files with 8 additions and 15 deletions
--- a/osu.Game/Graphics/UserInterface/ScreenTitle.cs
+++ b/osu.Game/Graphics/UserInterface/ScreenTitle.cs
@ -80,17 +80,12 @@ namespace osu.Game.Graphics.UserInterface
                            Font = OsuFont.GetFont(size: 20, weight: FontWeight.Bold),
                            Margin = new MarginPadding { Bottom = text_offset }
                        },
-                        new CircularContainer
+                        new Circle
                        {
                            Anchor = Anchor.Centre,
                            Origin = Anchor.Centre,
-                            Masking = true,
                            Size = new Vector2(4),
-                            Child = new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Colour = Color4.Gray,
-                            }
+                            Colour = Color4.Gray,
                        },
                        pageText = new OsuSpriteText
                        {