sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 15:16:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix obsolete font usages

Browse Source
This commit is contained in:
Dean Herbert
2019-03-04 12:06:41 +09:00
parent 73d266fe10
commit 132ce541f3
12 changed files with 39 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
View File

@ -7,6 +7,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Tournament.Components;
@ -174,9 +175,8 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
Text = team?.FullName.ToUpper() ?? "???",
X = (flip ? -1 : 1) * 90,
Y = -10,
TextSize = 20,
Colour = colour,
Font = "Aquatico-Regular",
Font = OsuFont.GetFont(typeface: Typeface.Aquatico, weight: FontWeight.Regular, size: 20),
Origin = anchor,
Anchor = anchor,
},
@ -219,8 +219,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
Origin = Anchor.Centre,
Colour = Color4.White,
Text = match.NewValue.Grouping.Value?.Name.Value ?? "Unknown Grouping",
Font = "Aquatico-Regular",
TextSize = 18,
Font = OsuFont.GetFont(typeface: Typeface.Aquatico, weight: FontWeight.Regular, size: 18),
},
};
}

20
osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs
View File

@ -7,6 +7,7 @@ using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using osu.Game.Tournament.IPC;
using osu.Game.Tournament.Screens.Ladder.Components;
@ -119,26 +120,15 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
public MatchScoreCounter()
{
Margin = new MarginPadding { Top = bar_height + 5, Horizontal = 10 };
Winning = false;
DisplayedCountSpriteText.FixedWidth = false;
Winning = false;
}
public bool Winning
{
set
{
if (value)
{
DisplayedCountSpriteText.Font = "Aquatico-Regular";
DisplayedCountSpriteText.TextSize = 60;
}
else
{
DisplayedCountSpriteText.Font = "Aquatico-Light";
DisplayedCountSpriteText.TextSize = 40;
}
}
set => DisplayedCountSpriteText.Font = value
? OsuFont.GetFont(typeface: Typeface.Aquatico, weight: FontWeight.Regular, size: 60)
: OsuFont.GetFont(typeface: Typeface.Aquatico, weight: FontWeight.Light, size: 40);
}
}
}