sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Allow custom icon specification in ScreenTitle

Browse Source 
Not all icons are available in fonts so IconUsage alone is not enough to cover all scenarios.
This commit is contained in:
Dean Herbert
2019-05-21 11:50:03 +09:00
parent 6c26d6fdf9
commit 808b45ac64
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
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,14 +13,24 @@ 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
{ {
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 protected string Title
@ -38,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;
@ -48,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,