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

Update icon usage to match framework changes

Browse Source
This commit is contained in:
Dean Herbert
2019-03-27 19:29:27 +09:00
parent 4e8945a2aa
commit de80fc0eac
159 changed files with 467 additions and 1307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
View File

@ -5,6 +5,7 @@ using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
@ -32,7 +33,7 @@ namespace osu.Game.Screens.Select.Options
set => background.Colour = value;
}
public FontAwesome Icon
public IconUsage Icon
{
get => iconText.Icon;
set => iconText.Icon = value;
@ -140,7 +141,7 @@ namespace osu.Game.Screens.Select.Options
Anchor = Anchor.TopCentre,
Size = new Vector2(30),
Shadow = true,
Icon = FontAwesome.fa_close,
Icon = FontAwesome.Close,
Margin = new MarginPadding
{
Bottom = 5,

4
osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
View File

@ -6,7 +6,7 @@ using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics;
using osu.Framework.Graphics.Sprites;
using osuTK;
using osuTK.Graphics;
using osuTK.Input;
@ -93,7 +93,7 @@ namespace osu.Game.Screens.Select.Options
/// <para>Lower depth to be put on the left, and higher to be put on the right.</para>
/// <para>Notice this is different to <see cref="Footer"/>!</para>
/// </param>
public void AddButton(string firstLine, string secondLine, FontAwesome icon, Color4 colour, Action action, Key? hotkey = null, float depth = 0)
public void AddButton(string firstLine, string secondLine, IconUsage icon, Color4 colour, Action action, Key? hotkey = null, float depth = 0)
{
var button = new BeatmapOptionsButton
{