Update icon usage to match framework changes

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

View File

@ -94,13 +94,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
{
new DivisorButton
{
Icon = FontAwesome.fa_chevron_left,
Icon = FontAwesome.ChevronLeft,
Action = beatDivisor.Previous
},
new DivisorText(beatDivisor),
new DivisorButton
{
Icon = FontAwesome.fa_chevron_right,
Icon = FontAwesome.ChevronRight,
Action = beatDivisor.Next
}
},

View File

@ -4,6 +4,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using osuTK;
@ -90,7 +91,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
{
RelativeSizeAxes = Axes.Y,
Height = 0.5f,
Icon = FontAwesome.fa_search_plus,
Icon = FontAwesome.SearchPlus,
Action = () => changeZoom(1)
},
new TimelineButton
@ -99,7 +100,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
Origin = Anchor.BottomLeft,
RelativeSizeAxes = Axes.Y,
Height = 0.5f,
Icon = FontAwesome.fa_search_minus,
Icon = FontAwesome.SearchMinus,
Action = () => changeZoom(-1)
},
}

View File

@ -5,6 +5,7 @@ using System;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using osuTK;
@ -17,7 +18,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
public Action Action;
public readonly BindableBool Enabled = new BindableBool(true);
public FontAwesome Icon
public IconUsage Icon
{
get => button.Icon;
set => button.Icon = value;