h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-20 00:03:21 +08:00
Code Issues Releases Wiki Activity

Merge pull request #4834 from peppy/screen-title-custom-icon

Browse Source 
Allow custom icon specification in ScreenTitle
This commit is contained in:
Dan Balasescu 2019-05-21 16:05:48 +09:00 committed by GitHub
commit 103c365165
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
osu.Game/Graphics/UserInterface/ScreenTitle.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System;
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.Framework.Graphics.Sprites;
@ -12,26 +13,33 @@ namespace osu.Game.Graphics.UserInterface
{ {
public abstract class ScreenTitle : CompositeDrawable, IHasAccentColour public abstract class ScreenTitle : CompositeDrawable, IHasAccentColour
{ {
private readonly SpriteIcon iconSprite; public const float ICON_WIDTH = ICON_SIZE + icon_spacing;
protected const float ICON_SIZE = 25;
private SpriteIcon iconSprite;
private readonly OsuSpriteText titleText, pageText; private readonly OsuSpriteText titleText, pageText;
public const float ICON_WIDTH = icon_size + icon_spacing;
private const float icon_size = 25, icon_spacing = 10; private const float icon_spacing = 10;
protected IconUsage Icon protected IconUsage Icon
{ {
get => iconSprite.Icon; set
set => iconSprite.Icon = value; {
if (iconSprite == null)
throw new InvalidOperationException($"Cannot use {nameof(Icon)} with a custom {nameof(CreateIcon)} function.");
iconSprite.Icon = value;
}
} }
protected string Title protected string Title
{ {
get => titleText.Text;
set => titleText.Text = value; set => titleText.Text = value;
} }
protected string Section protected string Section
{ {
get => pageText.Text;
set => pageText.Text = value; set => pageText.Text = value;
} }
@ -41,6 +49,11 @@ namespace osu.Game.Graphics.UserInterface
set => pageText.Colour = value; set => pageText.Colour = value;
} }
protected virtual Drawable CreateIcon() => iconSprite = new SpriteIcon
{
Size = new Vector2(ICON_SIZE),
};
protected ScreenTitle() protected ScreenTitle()
{ {
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
@ -51,12 +64,9 @@ namespace osu.Game.Graphics.UserInterface
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Spacing = new Vector2(icon_spacing, 0), Spacing = new Vector2(icon_spacing, 0),
Children = new Drawable[] Children = new[]
{ {
iconSprite = new SpriteIcon CreateIcon(),
{
Size = new Vector2(icon_size),
},
new FillFlowContainer new FillFlowContainer
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,