RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Allow custom icon specification in ScreenTitle
This commit is contained in:
Dan Balasescu 2019-05-21 16:05:48 +09:00 committed by GitHub
parent 58efa7a177 ad2a495dbc
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.
// See the LICENCE file in the repository root for full licence text.
using System;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
@ -12,26 +13,33 @@ namespace osu.Game.Graphics.UserInterface
{
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;
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
{
get => iconSprite.Icon;
set => iconSprite.Icon = value;
set
{
if (iconSprite == null)
throw new InvalidOperationException($"Cannot use {nameof(Icon)} with a custom {nameof(CreateIcon)} function.");
iconSprite.Icon = value;
}
}
protected string Title
{
get => titleText.Text;
set => titleText.Text = value;
}
protected string Section
{
get => pageText.Text;
set => pageText.Text = value;
}
@ -41,6 +49,11 @@ public Color4 AccentColour
set => pageText.Colour = value;
}
protected virtual Drawable CreateIcon() => iconSprite = new SpriteIcon
{
Size = new Vector2(ICON_SIZE),
};
protected ScreenTitle()
{
AutoSizeAxes = Axes.Both;
@ -51,12 +64,9 @@ protected ScreenTitle()
{
AutoSizeAxes = Axes.Both,
Spacing = new Vector2(icon_spacing, 0),
Children = new Drawable[]
Children = new[]
{
iconSprite = new SpriteIcon
{
Size = new Vector2(icon_size),
},
CreateIcon(),
new FillFlowContainer
{
AutoSizeAxes = Axes.Both,