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

Update in-line with framework changes.

Browse Source
This commit is contained in:
smoogipooo
2017-08-28 14:42:52 +09:00
parent 66db3389f6
commit fc6c682d88
11 changed files with 41 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Graphics/UserInterface/OsuContextMenu.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using OpenTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Audio;
@ -15,8 +16,7 @@ using osu.Game.Graphics.Sprites;
namespace osu.Game.Graphics.UserInterface
{
public class OsuContextMenu<TItem> : OsuMenu<TItem>
where TItem : OsuContextMenuItem
public class OsuContextMenu : OsuMenu
{
private const int fade_duration = 250;
@ -42,7 +42,7 @@ namespace osu.Game.Graphics.UserInterface
protected override MarginPadding ItemFlowContainerPadding => new MarginPadding { Vertical = DrawableOsuContextMenuItem.MARGIN_VERTICAL };
protected override DrawableMenuItem CreateDrawableMenuItem(TItem item) => new DrawableOsuContextMenuItem(this, item);
protected override DrawableMenuItem CreateDrawableMenuItem(MenuItem item) => new DrawableOsuContextMenuItem(item);
#region DrawableOsuContextMenuItem
private class DrawableOsuContextMenuItem : DrawableMenuItem
@ -57,9 +57,11 @@ namespace osu.Game.Graphics.UserInterface
private TextContainer text;
public DrawableOsuContextMenuItem(Menu<TItem> menu, TItem item)
public DrawableOsuContextMenuItem(MenuItem item)
: base(item)
{
if (!(Item is OsuMenuItem))
throw new ArgumentException($"{nameof(item)} must be a {nameof(OsuMenuItem)}.");
}
[BackgroundDependencyLoader]
@ -76,7 +78,7 @@ namespace osu.Game.Graphics.UserInterface
private void updateTextColour()
{
switch (Item.Type)
switch (((OsuMenuItem)Item).Type)
{
case MenuItemType.Standard:
text.Colour = Color4.White;