Merge dependency

osu.Game/Graphics/UserInterface/ScreenTitle.cs

@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics.Sprites;
 using osuTK;
@@ -13,15 +14,15 @@ namespace osu.Game.Graphics.UserInterface
 {
     public abstract class ScreenTitle : CompositeDrawable, IHasAccentColour
     {
-        public const float ICON_WIDTH = ICON_SIZE + icon_spacing;
+        public const float ICON_WIDTH = ICON_SIZE + spacing;
 
-        public const float ICON_SIZE = 25;
+        public const float ICON_SIZE = 30;
+        private const float spacing = 6;
+        private const int text_offset = 2;
 
         private SpriteIcon iconSprite;
         private readonly OsuSpriteText titleText, pageText;
 
-        private const float icon_spacing = 10;
-
         protected IconUsage Icon
         {
             set
@@ -63,26 +64,40 @@ namespace osu.Game.Graphics.UserInterface
                 new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
-                    Spacing = new Vector2(icon_spacing, 0),
+                    Spacing = new Vector2(spacing, 0),
-                    Children = new[]
-                    {
-                        CreateIcon(),
-                        new FillFlowContainer
-                        {
-                            AutoSizeAxes = Axes.Both,
                     Direction = FillDirection.Horizontal,
-                            Spacing = new Vector2(6, 0),
                     Children = new[]
                     {
+                        CreateIcon().With(t =>
+                        {
+                            t.Anchor = Anchor.Centre;
+                            t.Origin = Anchor.Centre;
+                        }),
                         titleText = new OsuSpriteText
                         {
-                                    Font = OsuFont.GetFont(size: 30, weight: FontWeight.Light),
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Font = OsuFont.GetFont(size: 20, weight: FontWeight.Bold),
+                            Margin = new MarginPadding { Bottom = text_offset }
+                        },
+                        new CircularContainer
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Masking = true,
+                            Size = new Vector2(4),
+                            Child = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Colour = Color4.Gray,
+                            }
                         },
                         pageText = new OsuSpriteText
                         {
-                                    Font = OsuFont.GetFont(size: 30, weight: FontWeight.Light),
+                            Anchor = Anchor.Centre,
-                                }
+                            Origin = Anchor.Centre,
-                            }
+                            Font = OsuFont.GetFont(size: 20),
+                            Margin = new MarginPadding { Bottom = text_offset }
                         }
                     }
                 },

osu.Game/Graphics/UserInterface/ScreenTitleTextureIcon.cs

@@ -4,7 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osuTK;
@@ -16,8 +15,6 @@ namespace osu.Game.Graphics.UserInterface
     /// </summary>
     public class ScreenTitleTextureIcon : CompositeDrawable
     {
-        private const float circle_allowance = 0.8f;
-
         private readonly string textureName;
 
         public ScreenTitleTextureIcon(string textureName)
@@ -26,38 +23,16 @@ namespace osu.Game.Graphics.UserInterface
         }
 
         [BackgroundDependencyLoader]
-        private void load(TextureStore textures, OsuColour colours)
+        private void load(TextureStore textures)
         {
-            Size = new Vector2(ScreenTitle.ICON_SIZE / circle_allowance);
+            Size = new Vector2(ScreenTitle.ICON_SIZE);
 
-            InternalChildren = new Drawable[]
+            InternalChild = new Sprite
-            {
-                new CircularContainer
-                {
-                    Masking = true,
-                    BorderColour = colours.Violet,
-                    BorderThickness = 3,
-                    MaskingSmoothness = 1,
-                    RelativeSizeAxes = Axes.Both,
-                    Children = new Drawable[]
-                    {
-                        new Sprite
             {
                 RelativeSizeAxes = Axes.Both,
                 Texture = textures.Get(textureName),
-                            Size = new Vector2(circle_allowance),
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                        },
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = colours.Violet,
-                            Alpha = 0,
-                            AlwaysPresent = true,
-                        },
-                    }
-                },
             };
         }
     }

osu.Game/Overlays/Changelog/ChangelogHeader.cs

@@ -111,7 +111,7 @@ namespace osu.Game.Overlays.Changelog
 
             public ChangelogHeaderTitle()
             {
-                Title = "Changelog";
+                Title = "changelog";
                 Version = null;
             }
 

osu.Game/Overlays/News/NewsHeader.cs

@@ -15,7 +15,7 @@ namespace osu.Game.Overlays.News
 {
     public class NewsHeader : OverlayHeader
     {
-        private const string front_page_string = "Front Page";
+        private const string front_page_string = "frontpage";
 
         private NewsHeaderTitle title;
 
@@ -33,7 +33,7 @@ namespace osu.Game.Overlays.News
                     ShowFrontPage?.Invoke();
             };
 
-            Current.ValueChanged += showArticle;
+            Current.ValueChanged += showPost;
         }
 
         [BackgroundDependencyLoader]
@@ -42,7 +42,7 @@ namespace osu.Game.Overlays.News
             TabControl.AccentColour = colour.Violet;
         }
 
-        private void showArticle(ValueChangedEvent<string> e)
+        private void showPost(ValueChangedEvent<string> e)
         {
             if (e.OldValue != null)
                 TabControl.RemoveItem(e.OldValue);
@@ -52,12 +52,12 @@ namespace osu.Game.Overlays.News
                 TabControl.AddItem(e.NewValue);
                 TabControl.Current.Value = e.NewValue;
 
-                title.IsReadingArticle = true;
+                title.IsReadingPost = true;
             }
             else
             {
                 TabControl.Current.Value = front_page_string;
-                title.IsReadingArticle = false;
+                title.IsReadingPost = false;
             }
         }
 
@@ -84,17 +84,17 @@ namespace osu.Game.Overlays.News
 
         private class NewsHeaderTitle : ScreenTitle
         {
-            private const string article_string = "Article";
+            private const string post_string = "post";
 
-            public bool IsReadingArticle
+            public bool IsReadingPost
             {
-                set => Section = value ? article_string : front_page_string;
+                set => Section = value ? post_string : front_page_string;
             }
 
             public NewsHeaderTitle()
             {
-                Title = "News";
+                Title = "news";
-                IsReadingArticle = false;
+                IsReadingPost = false;
             }
 
             protected override Drawable CreateIcon() => new ScreenTitleTextureIcon(@"Icons/news");