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

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

2
osu.Game/Overlays/Toolbar/Toolbar.cs
View File

@ -75,7 +75,7 @@ namespace osu.Game.Overlays.Toolbar
new ToolbarMusicButton(),
//new ToolbarButton
//{
// Icon = FontAwesome.fa_search
// Icon = FontAwesome.search
//},
userArea = new ToolbarUserArea(),
new ToolbarNotificationButton(),

4
osu.Game/Overlays/Toolbar/ToolbarButton.cs
View File

@ -27,13 +27,13 @@ namespace osu.Game.Overlays.Toolbar
IconContainer.Show();
}
public void SetIcon(FontAwesome icon) => SetIcon(new SpriteIcon
public void SetIcon(IconUsage icon) => SetIcon(new SpriteIcon
{
Size = new Vector2(20),
Icon = icon
});
public FontAwesome Icon
public IconUsage Icon
{
set => SetIcon(value);
}

4
osu.Game/Overlays/Toolbar/ToolbarChatButton.cs
View File

@ -2,7 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
using osu.Game.Graphics;
using osu.Framework.Graphics.Sprites;
namespace osu.Game.Overlays.Toolbar
{
@ -10,7 +10,7 @@ namespace osu.Game.Overlays.Toolbar
{
public ToolbarChatButton()
{
SetIcon(FontAwesome.fa_comments);
SetIcon(FontAwesome.Comments);
}
[BackgroundDependencyLoader(true)]

2
osu.Game/Overlays/Toolbar/ToolbarDirectButton.cs
View File

@ -10,7 +10,7 @@ namespace osu.Game.Overlays.Toolbar
{
public ToolbarDirectButton()
{
SetIcon(FontAwesome.fa_osu_chevron_down_o);
SetIcon(OsuIcon.ChevronDownCircle);
}
[BackgroundDependencyLoader(true)]

4
osu.Game/Overlays/Toolbar/ToolbarHomeButton.cs
View File

@ -1,7 +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 osu.Game.Graphics;
using osu.Framework.Graphics.Sprites;
namespace osu.Game.Overlays.Toolbar
{
@ -9,7 +9,7 @@ namespace osu.Game.Overlays.Toolbar
{
public ToolbarHomeButton()
{
Icon = FontAwesome.fa_home;
Icon = FontAwesome.Home;
TooltipMain = "Home";
TooltipSub = "Return to the main menu";
}

4
osu.Game/Overlays/Toolbar/ToolbarMusicButton.cs
View File

@ -2,7 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
using osu.Game.Graphics;
using osu.Framework.Graphics.Sprites;
namespace osu.Game.Overlays.Toolbar
{
@ -10,7 +10,7 @@ namespace osu.Game.Overlays.Toolbar
{
public ToolbarMusicButton()
{
Icon = FontAwesome.fa_music;
Icon = FontAwesome.Music;
}
[BackgroundDependencyLoader(true)]

3
osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs
View File

@ -6,6 +6,7 @@ using osu.Framework.Bindables;
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.Sprites;
using osuTK;
@ -23,7 +24,7 @@ namespace osu.Game.Overlays.Toolbar
public ToolbarNotificationButton()
{
Icon = FontAwesome.fa_bars;
Icon = FontAwesome.Bars;
TooltipMain = "Notifications";
TooltipSub = "Waiting for 'ya";

4
osu.Game/Overlays/Toolbar/ToolbarSettingsButton.cs
View File

@ -2,7 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
using osu.Game.Graphics;
using osu.Framework.Graphics.Sprites;
namespace osu.Game.Overlays.Toolbar
{
@ -10,7 +10,7 @@ namespace osu.Game.Overlays.Toolbar
{
public ToolbarSettingsButton()
{
Icon = FontAwesome.fa_gear;
Icon = FontAwesome.Gear;
TooltipMain = "Settings";
TooltipSub = "Change your settings";
}

4
osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
View File

@ -2,7 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
using osu.Game.Graphics;
using osu.Framework.Graphics.Sprites;
namespace osu.Game.Overlays.Toolbar
{
@ -10,7 +10,7 @@ namespace osu.Game.Overlays.Toolbar
{
public ToolbarSocialButton()
{
Icon = FontAwesome.fa_users;
Icon = FontAwesome.Users;
}
[BackgroundDependencyLoader(true)]